tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 8ffec13d: Merge "Add back Java resources to apk without Java code."

Browse source 
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
  Add back Java resources to apk without Java code.
This commit is contained in:
Ying Wang 2015-03-27 18:47:31 +00:00 committed by Android Git Automerger
commit ddc5a8f78c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/dpi_specific_apk.mk
View file

@ -47,7 +47,10 @@ $(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_mani
ifneq ($(jni_shared_libraries),)
$(add-jni-shared-libs-to-package)
endif
ifneq ($(full_classes_jar),)
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))
else
$(add-dex-to-package)
endif
$(add-carried-java-resources)

5
core/package_internal.mk
View file

@ -396,7 +396,10 @@ $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_
ifneq ($(jni_shared_libraries),)
$(add-jni-shared-libs-to-package)
endif
ifneq ($(full_classes_jar),)
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))
else
$(add-dex-to-package)
endif
$(sign-package)