diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-14 05:21:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 05:21:20 +0000 |
| commit | a47fb5ad5d3863bc6de418c7269d2463f39f432b (patch) | |
| tree | 5c234bc70de318a776f84dc4261984908c276935 | |
| parent | 228837b180de980abf68309d3547b3181441467d (diff) | |
| parent | 4ebbfd778790d4d4fb4c1ac4cee98edb4475bd3d (diff) | |
| download | frameworks_base-a47fb5ad5d3863bc6de418c7269d2463f39f432b.zip frameworks_base-a47fb5ad5d3863bc6de418c7269d2463f39f432b.tar.gz frameworks_base-a47fb5ad5d3863bc6de418c7269d2463f39f432b.tar.bz2 | |
Merge "Fix build." into mnc-dev
| -rw-r--r-- | tools/layoutlib/.idea/runConfigurations/Create.xml | 2 | ||||
| -rw-r--r-- | tools/layoutlib/Android.mk | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/layoutlib/.idea/runConfigurations/Create.xml b/tools/layoutlib/.idea/runConfigurations/Create.xml index bf8eba1..58f057a 100644 --- a/tools/layoutlib/.idea/runConfigurations/Create.xml +++ b/tools/layoutlib/.idea/runConfigurations/Create.xml @@ -3,7 +3,7 @@ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="com.android.tools.layoutlib.create.Main" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/icu4j-icudata-jarjar_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/icu4j-icutzdata-jarjar_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" /> + <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/icu4j-icudata-jarjar_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/icu4j-icutzdata-jarjar_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/javalib.jar" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../../" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index a0bfe62..61ddb04 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -38,11 +38,9 @@ built_ext_classes := $(call java-lib-files,ext) built_ext_data := $(call intermediates-dir-for, \ JAVA_LIBRARIES,ext,,COMMON)/javalib.jar built_icudata_dep := $(call java-lib-deps,icu4j-icudata-jarjar) -built_icudata_data := $(call intermediates-dir-for, \ - JAVA_LIBRARIES,icu4j-icudata-jarjar,,COMMON)/javalib.jar +built_icudata_data := $(call java-lib-files,icu4j-icudata-jarjar) built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-jarjar) -built_icutzdata_data := $(call intermediates-dir-for, \ - JAVA_LIBRARIES,icu4j-icutzdata-jarjar,,COMMON)/javalib.jar +built_icutzdata_data := $(call java-lib-files,icu4j-icutzdata-jarjar) built_layoutlib_create_jar := $(call intermediates-dir-for, \ JAVA_LIBRARIES,layoutlib_create,HOST)/javalib.jar |