Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-24941] Android: Fix /modules packaging on Android. #9197

Merged
merged 3 commits into from
Jul 6, 2017
Merged

[TIMOB-24941] Android: Fix /modules packaging on Android. #9197

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d213084
Fix modules packaging on Android.
ypbnv Jul 6, 2017
453ab38
Fix missing 'var'
ypbnv Jul 6, 2017
edcdf01
Merge branch 'master' into TIMOB-24941
cb1kenobi Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ Android.prototype.package = function (packager, next) {
},
// Copy over module resources
function (cb) {
fs.copy(DIST_ANDROID, ANDROID_MODULES, { filter: /\/android(\/titanium\-(.+)?\.(jar|res\.zip|respackage))?$/ }, cb);
filterRegExp = new RegExp('\\' + path.sep + 'android(\\' + path.sep + 'titanium\-(.+)?\.(jar|res\.zip|respackage))?$');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing var.

fs.copy(DIST_ANDROID, ANDROID_MODULES, { filter: filterRegExp}, cb);
}
], next);
};
Expand Down