diff options
author | Xavier Ducrohet <xav@android.com> | 2012-09-20 19:36:33 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2012-09-20 19:36:33 -0700 |
commit | 4b9ac140a32679ad6e0671f300c830814bad2e7a (patch) | |
tree | d0f5c662558c7378a0f2b1b12aa94b56eb4027b7 /builder | |
parent | 58d6448c2bb8d6772c76472bad1700b837ce0460 (diff) | |
download | build-4b9ac140a32679ad6e0671f300c830814bad2e7a.tar.gz |
Only create R class for libraries when the project is not a library.
Change-Id: Ia3359fd389aee6fc15796e1e6834cdd4864ecb09
Diffstat (limited to 'builder')
-rw-r--r-- | builder/src/main/java/com/android/builder/AndroidBuilder.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java index a9feb95..fb91ca6 100644 --- a/builder/src/main/java/com/android/builder/AndroidBuilder.java +++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java @@ -596,12 +596,13 @@ public class AndroidBuilder { // library specific options if (mVariant.getType() == VariantConfiguration.Type.LIBRARY) { command.add("--non-constant-id"); - } - - String extraPackages = mVariant.getLibraryPackages(); - if (extraPackages != null) { - command.add("--extra-packages"); - command.add(extraPackages); + } else { + // only create the R class from library dependencies if this is not a library itself. + String extraPackages = mVariant.getLibraryPackages(); + if (extraPackages != null) { + command.add("--extra-packages"); + command.add(extraPackages); + } } // AAPT options |