Merge "Skip obsolete JACK flags"

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

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) {