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.

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

[TIMOB-26131] Android: Do not copy geolocation libs #10127

Merged
merged 8 commits into from Jun 25, 2018

Conversation

garymathews
Copy link
Contributor

  • To prevent play services conflicts, prevent copying bundled play-service-*.jar files

JIRA Ticket

@garymathews garymathews added this to the 7.4.0 milestone Jun 20, 2018
build/android.js Outdated
@@ -111,6 +111,12 @@ Android.prototype.package = function (packager, next) {
function (cb) {
const moduleDirs = fs.readdirSync(path.join(ANDROID_ROOT, 'modules'));
async.each(moduleDirs, function (dir, callback) {

// skip geolocation
if ([ 'gelocation' ].includes(dir)) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

gelocation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

:)

Copy link
Contributor

@jquick-axway jquick-axway left a comment

Choose a reason for hiding this comment

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

CR: Pass

@hansemannn
Copy link
Collaborator

@garymathews Jenkins seems to continuously fail with this PR. Did you test the changes locally already?

build/android.js Outdated

// skip geolocation
if ([ 'geolocation' ].includes(dir)) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

You're never calling the callback, so I don't think this ever properly returns.

@build
Copy link
Contributor

build commented Jun 22, 2018

Messages
📖

💾 Here's the generated SDK zipfile.

Generated by 🚫 dangerJS

@hansemannn hansemannn merged commit 1a2343d into tidev:master Jun 25, 2018
@hansemannn hansemannn modified the milestones: 7.4.0, 7.5.0 Aug 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants