Merge "Skip obsolete JACK flags" (734879bc) · Commits · e / os / android_build_soong

androidmk/cmd/androidmk/android.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

+16 −0

Original line number	Diff line number	Diff line
		@@ -1091,6 +1091,22 @@ android_app {
		static_libs: FOO,
		static_libs: ["javalib"],
		java_resource_dirs: FOO,
		}
		`,
		},
		{
		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",

		}
		`,
		},