summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 06:52:07 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 06:52:07 +0000
commit45f0cbf3b63b029e8baf687bfafbb15dc46812bd (patch)
tree4cc0d3b5fee0fcf274b03dd1e9a4f9daa6ff8c1b
parent038d476bc08b77477f039d44a68117b6e24cca3e (diff)
parent31759f07013d0dfe99123cdd28bfa948dafbdb67 (diff)
downloaduml-android13-mainline-conscrypt-release.tar.gz
Snap for 8564071 from 31759f07013d0dfe99123cdd28bfa948dafbdb67 to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release
Change-Id: I3918f7548eafd3c718f55740256be0ba495d24b5
-rw-r--r--Android.mk1
-rw-r--r--METADATA3
-rw-r--r--uml.mk3
3 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..7fd0ea9
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1 @@
+$(eval $(call declare-1p-copy-files,device/generic/uml,))
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/uml.mk b/uml.mk
index 9657f20..369e0fe 100644
--- a/uml.mk
+++ b/uml.mk
@@ -28,7 +28,7 @@ PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.uml.rc:root/init.uml.rc
PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.eth0.sh:system/bin/init.eth0.sh
PRODUCT_PACKAGES += \
- adbd \
+ adbd.com.android.adbd \
adbd.recovery \
usbd \
android.hardware.configstore@1.1-service \
@@ -68,7 +68,6 @@ PRODUCT_PACKAGES += \
libm \
libpower \
libstdc++ \
- libsurfaceflinger \
libsysutils \
libui \
libutils \