aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-12-21 02:11:55 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-12-21 02:20:31 +0000
commit52aee44c42c3ab596c7fbe870a5c3869348ebf7e (patch)
tree7cd770fa10dbdab249eeaec861249a780e662aa9
parent4572eaa01a491ba4a6f7be6170111c6743baee38 (diff)
parentdd82625f27b8c05cb878587d36b0268f49d3dd5e (diff)
downloadbuild-52aee44c42c3ab596c7fbe870a5c3869348ebf7e.tar.gz
Make change and version bump to QQ2A.191221.001
Change-Id: I9c79250aeb30d9cfacc0aa10b5da46b1c25ed349
-rw-r--r--core/build_id.mk2
-rw-r--r--target/product/emulator_system.mk24
2 files changed, 25 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 7dd6cd3c4e..e11a399f9b 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=QQ2A.191220.001
+BUILD_ID=QQ2A.191221.001
diff --git a/target/product/emulator_system.mk b/target/product/emulator_system.mk
new file mode 100644
index 0000000000..4b6987cd9b
--- /dev/null
+++ b/target/product/emulator_system.mk
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This file lists emulator experimental modules added to PRODUCT_PACKAGES,
+# only included by targets sdk_phone_x86/64 and sdk_gphone_x86/64
+
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \
+ system/lib/libemulator_multidisplay_jni.so \
+ system/lib64/libemulator_multidisplay_jni.so \
+ system/priv-app/MultiDisplayProvider/MultiDisplayProvider.apk \
+
+PRODUCT_PACKAGES += MultiDisplayProvider