Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4be28931 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 5d4adbc4: am a47fb5ad: Merge "Fix build." into mnc-dev 

* commit '5d4adbc4':
  Fix build.
parents 961349a0 5d4adbc4

tools/layoutlib/.idea/runConfigurations/Create.xml

+1 −1
Original line number Diff line number Diff line
@@ -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="" />

tools/layoutlib/Android.mk

+2 −4
Original line number Diff line number Diff line
@@ -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