commit | 6404f16911f96d9253847c1390fd81f1923954cd | [log] [tgz] |
---|---|---|
author | Bob Badour <bbadour@google.com> | Wed Apr 21 20:01:10 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 20:01:10 2021 +0000 |
tree | d058665435e5c2bccf79ca0c7c9ee9c7165d0799 | |
parent | fc79fb744da2974d9f1df4d9e98ae094d07770c8 [diff] | |
parent | becd6292cafb1f9ae3776f404b72605a2542603f [diff] |
[LSC] Add LOCAL_LICENSE_KINDS to tools/test/graphicsbenchmark am: 31ca2c9050 am: 3016b1e15a am: becd6292ca Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1682292 Change-Id: If7bbeaeac141026599598f013ddd5257cbd5206f
diff --git a/apps/sample_app/Android.mk b/apps/sample_app/Android.mk index b25a33b..f5c271c 100644 --- a/apps/sample_app/Android.mk +++ b/apps/sample_app/Android.mk
@@ -18,6 +18,8 @@ LOCAL_SDK_VERSION := 26 # Oreo LOCAL_PACKAGE_NAME := GameCoreSampleApp +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_JNI_SHARED_LIBRARIES := libagq libgamecore_sample
diff --git a/functional_tests/java/Android.mk b/functional_tests/java/Android.mk index ed84344..0e1f3ec 100644 --- a/functional_tests/java/Android.mk +++ b/functional_tests/java/Android.mk
@@ -17,6 +17,8 @@ include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := GameCoreJavaTestCases +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := 26 # Oreo LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.test.rules \