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

[6_1_X][TIMOB-24834] Merge value resources into single file #9163

Merged
merged 1 commit into from Jun 20, 2017

Conversation

janvennemann
Copy link
Contributor

JIRA: https://jira.appcelerator.org/browse/TIMOB-24834

Optional Description:
6_1_X backport of #9162

Resource sets under the values folder can be split into different files. Those need to be merged back into a single values file so Android library resources and the app's resources can be properly merged.

See: https://android.googlesource.com/platform/tools/base/+/android-7.1.1_r43/sdk-common/src/main/java/com/android/ide/common/res2/MergedResourceWriter.java
@hansemannn hansemannn added this to the 6.1.1 milestone Jun 20, 2017
@mukherjee2 mukherjee2 requested review from mukherjee2 and removed request for sgtcoolguy June 20, 2017 17:16
Copy link
Contributor

@mukherjee2 mukherjee2 left a comment

Choose a reason for hiding this comment

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

Passed FR and CR from PR/9162

@mukherjee2 mukherjee2 merged commit d36d308 into tidev:6_1_X Jun 20, 2017
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

3 participants