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

Commit a0dd6087 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Handle LOCAL_JAVA_RESOURCE_FILES variable"

parents 45a5a287 9223a626

androidmk/cmd/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ func init() { 
			"LOCAL_RENDERSCRIPT_FLAGS":    "renderscript.flags",



			"LOCAL_JAVA_RESOURCE_DIRS":    "java_resource_dirs",

			"LOCAL_JAVA_RESOURCE_FILES":   "java_resources",

			"LOCAL_JAVACFLAGS":            "javacflags",

			"LOCAL_ERROR_PRONE_FLAGS":     "errorprone.javacflags",

			"LOCAL_DX_FLAGS":              "dxflags",

androidmk/cmd/androidmk/androidmk_test.go

+11 −0
Original line number Diff line number Diff line
@@ -577,6 +577,10 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) 
			include $(CLEAR_VARS)

			LOCAL_SRC_FILES := $(call all-java-files-under, src gen)

			include $(BUILD_STATIC_JAVA_LIBRARY)



			include $(CLEAR_VARS)

			LOCAL_JAVA_RESOURCE_FILES := foo bar

			include $(BUILD_STATIC_JAVA_LIBRARY)

		`,

		expected: `

			java_library {
@@ -604,6 +608,13 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) 
					"gen/**/*.java",

				],

			}



			java_library {

				java_resources: [

					"foo",

					"bar",

				],

			}

		`,

	},

	{