From c97761e781b24511872f8785d44286bb866d0b18 Mon Sep 17 00:00:00 2001 From: Yuntao Xu Date: Tue, 11 May 2021 12:39:54 -0700 Subject: [PATCH] Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk 1. add LOCAL_ENFORCE_USES_LIBRARIES support in the androidmk tool; 2. add one test case. Bug: 187838385 Test: run 'm androidmk' Test: TreeHugger Change-Id: Ibdde2a5a58ef45655a3083b592fa21f7fe63d032 --- androidmk/androidmk/android.go | 2 ++ androidmk/androidmk/androidmk_test.go | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go index f0f51bf6f..5316d7b32 100644 --- a/androidmk/androidmk/android.go +++ b/androidmk/androidmk/android.go @@ -216,6 +216,8 @@ func init() { "LOCAL_JETIFIER_ENABLED": "jetifier", "LOCAL_IS_UNIT_TEST": "unit_test", + + "LOCAL_ENFORCE_USES_LIBRARIES": "enforce_uses_libs", }) } diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index f32ff2acb..439f45d0a 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -1444,6 +1444,23 @@ runtime_resource_overlay { theme: "FooTheme", } +`, + }, + { + desc: "LOCAL_ENFORCE_USES_LIBRARIES", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foo +LOCAL_ENFORCE_USES_LIBRARIES := false +LOCAL_ENFORCE_USES_LIBRARIES := true +include $(BUILD_PACKAGE) +`, + expected: ` +android_app { + name: "foo", + enforce_uses_libs: false, + enforce_uses_libs: true, +} `, }, }