StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk" am: 89733a4ce5 am: 197dc43bfd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703985

Change-Id: I552ac1fefd6da7bbe804f51cb771cfc32b08ddef
This commit is contained in:
Yuntao Xu
2021-05-11 22:17:32 +00:00
committed by Automerger Merge Worker
parent 52fc6ab060 197dc43bfd
commit 732947b9ab
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/androidmk/android.go
View File

@@ -216,6 +216,8 @@ func init() {
"LOCAL_JETIFIER_ENABLED": "jetifier", "LOCAL_JETIFIER_ENABLED": "jetifier",
"LOCAL_IS_UNIT_TEST": "unit_test", "LOCAL_IS_UNIT_TEST": "unit_test",
"LOCAL_ENFORCE_USES_LIBRARIES": "enforce_uses_libs",
}) })
} }

17
androidmk/androidmk/androidmk_test.go
View File

@@ -1444,6 +1444,23 @@ runtime_resource_overlay {
theme: "FooTheme", 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,
}
`, `,
}, },
} }