[TIMOB-24446](6_1_X) Allow replacing bundled Android Support Libraries #9070
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
garymathews
reviewed
May 19, 2017
android/cli/commands/_build.js
Outdated
| @@ -3065,7 +3073,13 @@ AndroidBuilder.prototype.copyModuleResources = function copyModuleResources(next | |||
| resPkgFile = jarFile.replace(/\.jar$/, '.respackage'); | |||
|
|
|||
| if (fs.existsSync(resPkgFile) && fs.existsSync(resFile)) { | |||
| this.resPackages[resFile] = fs.readFileSync(resPkgFile).toString().split('\n').shift().trim(); | |||
| var packageName = fs.readFileSync(resPkgFile).toString().split('\n').shift().trim(); | |||
There was a problem hiding this comment.
Maybe support both line-endings? split(/\r?\n/)
garymathews
reviewed
May 19, 2017
android/cli/commands/_buildModule.js
Outdated
| @@ -422,8 +443,13 @@ AndroidModuleBuilder.prototype.processResources = function processResources(next | |||
| var resArchivePathAndFilename = path.join(modulesPath, file.replace(/\.jar$/, '.res.zip')); | |||
| var respackagePathAndFilename = path.join(modulesPath, file.replace(/\.jar$/, '.respackage')); | |||
| if (fs.existsSync(resArchivePathAndFilename) && fs.existsSync(respackagePathAndFilename)) { | |||
| extraPackages.push(fs.readFileSync(respackagePathAndFilename).toString().split('\n').shift().trim()); | |||
| resArchives.push(resArchivePathAndFilename); | |||
| var packageName = fs.readFileSync(respackagePathAndFilename).toString().split('\n').shift().trim(); | |||
garymathews
approved these changes
May 19, 2017
Fixes an issue with Hyperloop 2.1.0 which causes a crash when trying to override the Android Support Libraries with local .aar files. Hyperloop 2.1.0 will always manually add our bundled Android Support Libraries to the dexer paths even if they were replaced by the builder. To fix this we check the altered dexer paths again and remove any replaced libraries.
|
FR Passed. Used the steps in the ticket to do the FR. Studio Ver: 4.9.0.201705180402 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA: https://jira.appcelerator.org/browse/TIMOB-24446
Optional Description:
6_1_X backport of #9008