diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-30 04:29:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-30 04:29:37 +0000 |
| commit | f77c98a7804f7017c9c2c4634a90ce7acab86238 (patch) | |
| tree | 9a9892d97f2fa8bb3e124282081eca51a1e87916 | |
| parent | 9786fbb9d3a9b0ec0c035fcd37e99683341cec6c (diff) | |
| parent | e5811e8967c46bf9bd6cbe9a612102597b4207d7 (diff) | |
Merge "Revert "Revert "Revert "Revert "Use com.android.vndk.current variant for vndk list"""""
| -rw-r--r-- | rootdir/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e1bb02fc6..52417305f 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -326,7 +326,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.vendor) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.com.android.vndk.current) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) @@ -342,7 +342,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_CORE_LIBRARIES),.vendor) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_CORE_LIBRARIES),.com.android.vndk.current) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) @@ -358,7 +358,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.vendor) +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.com.android.vndk.current) $(LOCAL_BUILT_MODULE): @echo "Generate: $@" @mkdir -p $(dir $@) |