diff options
| author | Youngsang Cho <youngsang@google.com> | 2016-09-22 09:37:58 -0700 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2016-09-22 09:54:03 -0700 |
| commit | d67f1fcf2c1aefe06e9b8a05ebc104818567485e (patch) | |
| tree | 4c2e71827099bf372070106d6c68d95a48e26fb9 | |
| parent | 3ea0fea51368e7105486079385e88e34c47d98f2 (diff) | |
| download | TV-d67f1fcf2c1aefe06e9b8a05ebc104818567485e.tar.gz | |
Refactor Android.mk
- Use framework support lib for platform build.
- Use prebuilt support lib for app build.
- Remove PROTOC local change.
Bug: 31551523, Bug: 31589808
Change-Id: I0d7a00ffdda9c26ca25598360dcef92779eb862e
| -rw-r--r-- | Android.mk | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -16,15 +16,6 @@ LOCAL_PATH:= $(call my-dir) -# -------------------------------------------------------------- -# Use prebuilt aprotoc to compile .proto files - -ifeq ($(HOST_OS),darwin) -PROTOC := $(TOPDIR)prebuilts/misc/darwin-x86/protobuf/aprotoc -else -PROTOC := $(TOPDIR)prebuilts/misc/linux-x86/protobuf/aprotoc -endif - include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional @@ -45,9 +36,17 @@ LOCAL_MIN_SDK_VERSION := 23 # M LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/usbtuner-res \ - $(LOCAL_PATH)/common/res \ + $(LOCAL_PATH)/common/res + +ifdef TARGET_BUILD_APPS +LOCAL_RESOURCE_DIR += \ + $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ + $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res +else # !TARGET_BUILD_APPS +LOCAL_RESOURCE_DIR += \ $(TOP)/frameworks/support/v17/leanback/res \ - $(TOP)/frameworks/support/v7/recyclerview/res \ + $(TOP)/frameworks/support/v7/recyclerview/res +endif LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ |