OSDN Git Service

Add basic VNDK support in Make
authorDan Willemsen <dwillemsen@google.com>
Tue, 29 Nov 2016 20:42:32 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 20:42:32 +0000 (20:42 +0000)
am: bab0fa6928

Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92

1  2 
core/base_rules.mk
core/clear_vars.mk
core/config.mk

Simple merge
@@@ -215,9 -215,8 +215,10 @@@ LOCAL_REPLACE_PREBUILT_APK_INSTALLED:
  LOCAL_NDK_VERSION:=current
  LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES:=
  LOCAL_LOGTAGS_FILES:=
 +LOCAL_EXTRACT_APK:=
 +LOCAL_EXTRACT_DPI_APK:=
  LOCAL_RECORDED_MODULE_TYPE:=
+ LOCAL_USE_VNDK:=
  
  # arch specific variables
  LOCAL_SRC_FILES_$(TARGET_ARCH):=
diff --cc core/config.mk
Simple merge