commit 1b0165c260c581bebace558fb10b14bfa21c8508
author Colin Cross <ccross@android.com> Fri Jul 21 17:10:00 2017 -0700
committer Colin Cross <ccross@android.com> Fri Jul 21 17:13:21 2017 -0700
tree 31ff3da358880f5ac0a43a41e262037b0eb2b107
parent 4204d558c372a62fc7f1475aa80adbb15f1a489b

Fix TARGET_BUILD_APPS build with proguard

Fix missing transitive dependency issues caught by proguard.

Test: m -j ANDROID_COMPILE_WITH_JACK=false TARGET_BUILD_APPS=Camera2
Change-Id: If0905e42ee49c1d4b8191f543168b25e1d2c596b

Android.mk

diff --git a/Android.mk b/Android.mk
index 745a2ad..62425bf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,8 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-compat
 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
@@ -25,6 +27,13 @@
         --auto-add-overlay \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
+        --extra-packages android.support.compat \
+
+ifeq ($(TARGET_BUILD_APPS),)
+    LOCAL_RESOURCE_DIR += frameworks/support/compat/res
+else
+    LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/compat/res
+endif
 
 LOCAL_PACKAGE_NAME := Camera2