From 72c2547334ce022e1149cf60b9eab845b5de3057 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 24 Mar 2020 09:29:46 +0900
Subject: adbd is not available for platform

adbd is in the adbd apex (com.android.adbd) and is not available for
platform. To refer to the adbd in the apex in *.mk file, we need to use
its apex-specific name <module_name>.<apex_name>.

Bug: 152190149
Test: choosecombo into uml and m
Change-Id: I78709039ad5112b03e52c644b09f0dea4c863604
---
 uml.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uml.mk b/uml.mk
index 620d26e..e175182 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 \
-- 
cgit v1.2.3


From 12d2a04ea6ba2ae7a394e1dcbcf1a583a9b77536 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 1 May 2020 08:16:25 -0700
Subject: Add METADATA to uml: Apache2=NOTICE

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I170ddbfa9be3ef3e758a84e058e250cbabad3e00
---
 METADATA | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 METADATA

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
+}
-- 
cgit v1.2.3


From 9015e0f59b2f925711b0b55618cb065e44e627ca Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 8 Sep 2020 21:27:45 -0700
Subject: Remove libsurfaceflinger from product packages

This is a generic dependency of surfaceflinger and
doesn't need to be listed here explicitly.

libsurfaceflinger is also going away

Bug: 168077202
Test: none
Change-Id: I4a210e0021324b7dfeb6bca18a19ee0747a9184b
---
 uml.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uml.mk b/uml.mk
index 7f15f07..369e0fe 100644
--- a/uml.mk
+++ b/uml.mk
@@ -68,7 +68,6 @@ PRODUCT_PACKAGES += \
     libm \
     libpower \
     libstdc++ \
-    libsurfaceflinger \
     libsysutils \
     libui \
     libutils \
-- 
cgit v1.2.3


From bb4fd1d9d69959f6df6609c8a4b1bd480fd05800 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Sun, 13 Feb 2022 22:17:33 -0800
Subject: Declare license metadata for copied files.

Bug: 151177513

Test: m all dist reportmissinglicenses
Change-Id: I017fd9cc381b5c446782d39a2007a24e274f8e9d
---
 Android.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Android.mk

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,))
-- 
cgit v1.2.3