diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-05-14 16:08:05 -0700 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2019-09-27 20:31:00 -0700 |
| commit | 9fc8a40ac246762a1fa2c36f51cd46ff12a934bc (patch) | |
| tree | c3415c8f52162a90792234325e2418e88abb69fe /androidmk | |
| parent | 6872d949f2d00fddf9e12d84e9706eb5bea0c887 (diff) | |
| download | build_soong-9fc8a40ac246762a1fa2c36f51cd46ff12a934bc.tar.gz build_soong-9fc8a40ac246762a1fa2c36f51cd46ff12a934bc.tar.bz2 build_soong-9fc8a40ac246762a1fa2c36f51cd46ff12a934bc.zip | |
androidmk conversion logic for android_app_import
Test: androidmk_test.go, bpfix_test.go
Bug: 128610294
Change-Id: Ide183ba1e696fa0ffb4245e3288ffc47535b39af
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index e3c5b93a..0c048083 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -935,6 +935,7 @@ var prebuiltTypes = map[string]string{ "STATIC_LIBRARIES": "cc_prebuilt_library_static", "EXECUTABLES": "cc_prebuilt_binary", "JAVA_LIBRARIES": "java_import", + "APPS": "android_app_import", "ETC": "prebuilt_etc", } diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index f2dc6ff2..9570d364 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -1112,6 +1112,32 @@ android_app { } `, }, + { + desc: "android_app_import", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foo +LOCAL_SRC_FILES := foo.apk +LOCAL_PRIVILEGED_MODULE := true +LOCAL_MODULE_CLASS := APPS +LOCAL_MODULE_TAGS := optional +LOCAL_DEX_PREOPT := false +include $(BUILD_PREBUILT) +`, + expected: ` +android_app_import { + name: "foo", + + privileged: true, + + dex_preopt: { + enabled: false, + }, + apk: "foo.apk", + +} +`, + }, } func TestEndToEnd(t *testing.T) { |