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

Commit bbd028cd authored Feb 23, 2018 by hansson Committed by android-build-merger Feb 23, 2018

Merge "frameworks/native: Set LOCAL_SDK_VERSION where possible." am: 8b3b1089 am: 52d0ad70

am: 1d385c12

Change-Id: I9746d2aa19a8926cfce37960af8c3db801528bcb

parents df2ad650 1d385c12

opengl/tests/gl2_java/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,5 +14,6 @@ LOCAL_MODULE_TAGS := optional
	LOCAL_SRC_FILES := $(call all-subdir-java-files)		LOCAL_SRC_FILES := $(call all-subdir-java-files)

	LOCAL_PACKAGE_NAME := GL2Java		LOCAL_PACKAGE_NAME := GL2Java
			LOCAL_SDK_VERSION := current

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)

opengl/tests/gl2_jni/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional
	LOCAL_SRC_FILES := $(call all-subdir-java-files)		LOCAL_SRC_FILES := $(call all-subdir-java-files)

	LOCAL_PACKAGE_NAME := GL2JNI		LOCAL_PACKAGE_NAME := GL2JNI
			LOCAL_SDK_VERSION := current

	LOCAL_JNI_SHARED_LIBRARIES := libgl2jni		LOCAL_JNI_SHARED_LIBRARIES := libgl2jni

opengl/tests/gl_jni/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional
	LOCAL_SRC_FILES := $(call all-subdir-java-files)		LOCAL_SRC_FILES := $(call all-subdir-java-files)

	LOCAL_PACKAGE_NAME := GLJNI		LOCAL_PACKAGE_NAME := GLJNI
			LOCAL_SDK_VERSION := current

	LOCAL_JNI_SHARED_LIBRARIES := libgljni		LOCAL_JNI_SHARED_LIBRARIES := libgljni

opengl/tests/gldual/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional
	LOCAL_SRC_FILES := $(call all-subdir-java-files)		LOCAL_SRC_FILES := $(call all-subdir-java-files)

	LOCAL_PACKAGE_NAME := GLDual		LOCAL_PACKAGE_NAME := GLDual
			LOCAL_SDK_VERSION := current

	LOCAL_JNI_SHARED_LIBRARIES := libgldualjni		LOCAL_JNI_SHARED_LIBRARIES := libgldualjni

opengl/tests/lighting1709/Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests
	LOCAL_SRC_FILES := $(call all-subdir-java-files)		LOCAL_SRC_FILES := $(call all-subdir-java-files)

	LOCAL_PACKAGE_NAME := LightingTest		LOCAL_PACKAGE_NAME := LightingTest
			LOCAL_SDK_VERSION := current
	LOCAL_CERTIFICATE := platform		LOCAL_CERTIFICATE := platform

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)