diff options
| author | 2018-02-23 07:47:04 +0000 | |
|---|---|---|
| committer | 2018-02-23 07:47:04 +0000 | |
| commit | bbd028cd52307c8bb1f2156a1c57da29ace90ce6 (patch) | |
| tree | fa00fad594ea8a63a23eb6d6fd5f52a04e1b446c | |
| parent | df2ad65036f66979005620683ce11958e415e378 (diff) | |
| parent | 1d385c1268d9db2cce729bb5c37a326bf6b22313 (diff) | |
Merge "frameworks/native: Set LOCAL_SDK_VERSION where possible." am: 8b3b108987 am: 52d0ad7033
am: 1d385c1268
Change-Id: I9746d2aa19a8926cfce37960af8c3db801528bcb
| -rw-r--r-- | opengl/tests/gl2_java/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gl2_jni/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/gldual/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/lighting1709/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/testFramerate/Android.mk | 1 | ||||
| -rw-r--r-- | opengl/tests/testPauseResume/Android.mk | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/opengl/tests/gl2_java/Android.mk b/opengl/tests/gl2_java/Android.mk index 34f4aeea21..71aa5a05f1 100644 --- a/opengl/tests/gl2_java/Android.mk +++ b/opengl/tests/gl2_java/Android.mk @@ -14,5 +14,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := GL2Java +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 409bd734db..af65b5fe71 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := GL2JNI +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libgl2jni diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index 11b4c8be9d..570ae2b88f 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := GLJNI +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libgljni diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index 1991ed97ac..dc265b6e0d 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -14,6 +14,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := GLDual +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libgldualjni diff --git a/opengl/tests/lighting1709/Android.mk b/opengl/tests/lighting1709/Android.mk index 9563e617f3..004723176e 100644 --- a/opengl/tests/lighting1709/Android.mk +++ b/opengl/tests/lighting1709/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LightingTest +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/opengl/tests/testFramerate/Android.mk b/opengl/tests/testFramerate/Android.mk index 500abf376a..2864fcf2c4 100644 --- a/opengl/tests/testFramerate/Android.mk +++ b/opengl/tests/testFramerate/Android.mk @@ -15,5 +15,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := TestFramerate +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/opengl/tests/testPauseResume/Android.mk b/opengl/tests/testPauseResume/Android.mk index cf8bdc35f0..dda5424360 100644 --- a/opengl/tests/testPauseResume/Android.mk +++ b/opengl/tests/testPauseResume/Android.mk @@ -14,5 +14,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := TestEGL +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) |