diff options
| author | Ng Zhi An <zhin@google.com> | 2019-03-15 15:03:49 -0700 |
|---|---|---|
| committer | Ng Zhi An <zhin@google.com> | 2019-03-15 15:03:49 -0700 |
| commit | e02e41a9ea23abd3740c08f1fd086214c09ba240 (patch) | |
| tree | 487c72e8b2eadfcec95b494d81d9d793bd8410fe /androidmk | |
| parent | 66184450d5765889a5fb71d14c1a44959ebaefbe (diff) | |
| download | build_soong-e02e41a9ea23abd3740c08f1fd086214c09ba240.tar.gz build_soong-e02e41a9ea23abd3740c08f1fd086214c09ba240.tar.bz2 build_soong-e02e41a9ea23abd3740c08f1fd086214c09ba240.zip | |
Skip obsolete JACK flags
Fixes: 127712304
Test: m androidmk
Change-Id: Ia2f0ccd184151c691563779d1828c111800ed382
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 2 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 1d66ab75..9276eb5f 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -76,6 +76,8 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){ "LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin "LOCAL_CTS_TEST_PACKAGE": skip, // Obsolete + "LOCAL_JACK_ENABLED": skip, // Obselete + "LOCAL_JACK_FLAGS": skip, // Obselete } // adds a group of properties all having the same type diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 2976a0cd..e3499d2e 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -1094,6 +1094,22 @@ android_app { } `, }, + { + desc: "blah", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foo +LOCAL_JACK_ENABLED := incremental +LOCAL_JACK_FLAGS := --multi-dex native +include $(BUILD_PACKAGE) + `, + expected: ` +android_app { + name: "foo", + +} + `, + }, } func TestEndToEnd(t *testing.T) { |