AAPT2: library resource compilation

- Switch to static library's package-res.apk as the link artifact.
- For prebuilt AAR file, build package-res.apk using aapt2's "--dir"
  option.
- New LOCAL variables:
  LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true".
  LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled
                   resources.
  LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled
                   resources.

Bug: 25958912
Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 6efeb35..e70e783 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -30,9 +30,6 @@
 intermediates.COMMON := $(call local-intermediates-dir,COMMON)
 
 my_res_package :=
-# A zip file that apps can link with aapt2
-# We need my_library_resources as dependency even if a library doesn't have resource.
-my_library_resources := $(intermediates.COMMON)/library-res.flata
 
 # Hack to build static Java library with Android resource
 # See bug 5714516
@@ -80,7 +77,7 @@
 R_file_stamp := $(intermediates.COMMON)/src/R.stamp
 LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
 
-ifdef USE_AAPT2
+ifdef LOCAL_USE_AAPT2
 # For library we treat all the resource equal with no overlay.
 my_res_resources := $(all_resources)
 my_overlay_resources :=
@@ -88,7 +85,7 @@
 my_res_package := $(intermediates.COMMON)/package-res.apk
 
 LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
-endif  # USE_AAPT2
+endif  # LOCAL_USE_AAPT2
 endif  # LOCAL_RESOURCE_DIR
 
 all_res_assets := $(all_resources)
@@ -121,8 +118,8 @@
 
 # add --non-constant-id to prevent inlining constants.
 # AAR needs text symbol file R.txt.
-ifdef USE_AAPT2
-$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --non-final-ids
+ifdef LOCAL_USE_AAPT2
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --static-lib --no-static-lib-packages
 else
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --non-constant-id --output-text-symbols $(LOCAL_INTERMEDIATE_SOURCE_DIR)
 endif
@@ -141,11 +138,13 @@
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME :=
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR :=
 
-ifdef USE_AAPT2
+ifdef LOCAL_USE_AAPT2
 # For libraries don't use any product specific flags.
 my_aapt_characteristics :=
 # One more level with name res so we can zip up the flat resources that can be linked by apps.
 my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res/res
+my_generated_res_dirs := $(rs_generated_res_dir)
+my_generated_res_dirs_deps := $(RenderScript_file_stamp)
 include $(BUILD_SYSTEM)/aapt2.mk
 $(my_res_package) : $(framework_res_package_export_deps)
 else
@@ -153,7 +152,7 @@
 	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"
 	$(create-resource-java-files)
 	$(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@
-endif  # USE_AAPT2
+endif  # LOCAL_USE_AAPT2
 
 $(LOCAL_BUILT_MODULE): $(R_file_stamp)
 ifdef LOCAL_JACK_ENABLED
@@ -184,18 +183,6 @@
 ALL_MODULES.$(LOCAL_MODULE).AAR := $(built_aar)
 endif  # need_compile_res
 
-ifdef USE_AAPT2
-# If a static Java library has no resources, create empty package apps can depend on.
-$(my_library_resources): PRIVATE_RES_DIR := $(intermediates.COMMON)/flat-res/res
-$(my_library_resources) : $(my_res_package)
-	@echo "Package static library resources $@"
-	@rm -rf $@ && mkdir -p $(dir $@) $(PRIVATE_RES_DIR)
-	$(hide) cd $(dir $(PRIVATE_RES_DIR)) && zip -qrX $(abspath $@) $(notdir $(PRIVATE_RES_DIR))
-
-# Make sure my_library_resources is created when you run mm/mmm.
-$(LOCAL_BUILT_MODULE) : $(my_library_resources)
-endif  # USE_AAPT2
-
 # Reset internal variables.
 all_res_assets :=
 LOCAL_IS_STATIC_JAVA_LIBRARY :=