diff options
| author | 2022-01-25 22:08:59 +0000 | |
|---|---|---|
| committer | 2022-01-25 23:10:21 +0000 | |
| commit | 82cf9a7d4b3a62f9d2e23a62c151ead595a7d5af (patch) | |
| tree | 890e9ce1f7b6f65408214b331cddf2023c03e180 /androidmk | |
| parent | 620dc3f4f9893196036257844b8727e0043d50e5 (diff) | |
Remove res and assets in androidmk if default
Test: new tests in androidmk_test and bpfix_test. Ran against file.
Fixes: 209019903
Change-Id: I5fc9005302c006b3205b4cbd04cef7c2aca40bc8
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/androidmk/androidmk_test.go | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index 3c3619769..abdbf5373 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -699,7 +699,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) expected: ` android_library { srcs: ["test.java"], - resource_dirs: ["res"], + jacoco: { include_filter: ["foo.*"], }, @@ -1458,7 +1458,7 @@ include $(BUILD_RRO_PACKAGE) runtime_resource_overlay { name: "foo", product_specific: true, - resource_dirs: ["res"], + sdk_version: "current", theme: "FooTheme", @@ -1604,6 +1604,22 @@ cc_prebuilt_library_shared { } `, }, + { + desc: "Drop default resource and asset dirs from bp", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foo +LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +include $(BUILD_PACKAGE) +`, + expected: ` +android_app { + name: "foo", + +} +`, + }, } func TestEndToEnd(t *testing.T) { |