Follow renames of host libraries Follow renames of icu4j-icudata-host-jarjar -> icu4j-icudata-jarjar and icu4j-icutzdata-host-jarjar -> icu4j-icutzdata-jarjar. Test: m checkbuild Change-Id: Icf24dafedaae79be4365066a830190e3fe73c71f
diff --git a/.idea/runConfigurations/Create.xml b/.idea/runConfigurations/Create.xml index 8162550..aabaede 100644 --- a/.idea/runConfigurations/Create.xml +++ b/.idea/runConfigurations/Create.xml
@@ -4,7 +4,7 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="MAIN_CLASS_NAME" value="com.android.tools.layoutlib.create.Main" /> <module name="create" /> - <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/classes.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/ext_intermediates/classes.jar out/host/common/obj/JAVA_LIBRARIES/icu4j-icudata-host-jarjar_intermediates/classes-jarjar.jar out/host/common/obj/JAVA_LIBRARIES/icu4j-icutzdata-host-jarjar_intermediates/classes-jarjar.jar" /> + <option name="PROGRAM_PARAMETERS" value="out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/classes.jar out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/classes.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/ext_intermediates/classes.jar out/host/common/obj/JAVA_LIBRARIES/icu4j-icudata-jarjar_intermediates/classes-jarjar.jar out/host/common/obj/JAVA_LIBRARIES/icu4j-icutzdata-jarjar_intermediates/classes-jarjar.jar" /> <option name="VM_PARAMETERS" value="-ea" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../.." /> <RunnerSettings RunnerId="Debug"> @@ -17,4 +17,4 @@ <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> -</component> \ No newline at end of file +</component>
diff --git a/Android.mk b/Android.mk index e9aa138..3cc84ba 100644 --- a/Android.mk +++ b/Android.mk
@@ -39,8 +39,8 @@ built_ext_dep := $(call java-lib-deps,ext) built_ext_classes := $(call java-lib-files,ext) -built_icudata_dep := $(call java-lib-deps,icu4j-icudata-host-jarjar,HOST) -built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-host-jarjar,HOST) +built_icudata_dep := $(call java-lib-deps,icu4j-icudata-jarjar,HOST) +built_icutzdata_dep := $(call java-lib-deps,icu4j-icutzdata-jarjar,HOST) built_layoutlib_create_jar := $(call java-lib-files,layoutlib_create,HOST)