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

Commit 89733a4c authored by Yuntao Xu's avatar Yuntao Xu Committed by Gerrit Code Review
Browse files

Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk"

parents 4dac3874 c97761e7

androidmk/androidmk/android.go

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ func init() { 
			"LOCAL_JETIFIER_ENABLED":      "jetifier",



			"LOCAL_IS_UNIT_TEST": "unit_test",



			"LOCAL_ENFORCE_USES_LIBRARIES": "enforce_uses_libs",

		})

}

androidmk/androidmk/androidmk_test.go

+17 −0
Original line number Diff line number Diff line
@@ -1444,6 +1444,23 @@ runtime_resource_overlay { 
	theme: "FooTheme",



}

`,

	},

	{

		desc: "LOCAL_ENFORCE_USES_LIBRARIES",

		in: `

include $(CLEAR_VARS)

LOCAL_MODULE := foo

LOCAL_ENFORCE_USES_LIBRARIES := false

LOCAL_ENFORCE_USES_LIBRARIES := true

include $(BUILD_PACKAGE)

`,

		expected: `

android_app {

    name: "foo",

    enforce_uses_libs: false,

    enforce_uses_libs: true,

}

`,

	},

}