[TIMOB-24911] Android: Filtering R. files when building Android modules does not work on Windows. #9183
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
ypbnv
changed the title
janvennemann
requested changes
Jun 30, 2017
android/cli/commands/_buildModule.js
Outdated
| @@ -1607,7 +1607,7 @@ AndroidModuleBuilder.prototype.packageZip = function (next) { | |||
| moduleJarArchive.on('error', cb); | |||
| moduleJarArchive.pipe(moduleJarStream); | |||
|
|
|||
| var excludeRegex = /.*\/R\.class$|.*\/R\$(.*)\.class$/i; | |||
| var excludeRegex = new RegExp('.*\\' + path.sep + 'R\\\.class$|.*\\' + path.sep + 'R\\\$(.*)\\\.class$', 'i'); | |||
There was a problem hiding this comment.
The three backslashes as escape characters are unnecessary here, for example R\\.class$ already results in in the correct regex R\.class$
|
@janvennemann Updated. |
janvennemann
approved these changes
Jul 3, 2017
|
Merged for parity with |
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-24911
Change regular expression to handle platform specific paths.
Description:
Windows OS only. Regular expression does not match files' path with backslashes, so they are included in the .jar and duplicated.