Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e02e41a9 authored by Ng Zhi An's avatar Ng Zhi An
Browse files

Skip obsolete JACK flags 

Fixes: 127712304
Test: m androidmk
Change-Id: Ia2f0ccd184151c691563779d1828c111800ed382
parent 66184450

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

androidmk/cmd/androidmk/androidmk_test.go

+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",



}

		`,

	},