commit 36ade67c501af52cd1a9bac42b5122b7db8b29eb
author Ram Muthiah <rammuthiah@google.com> Wed Dec 11 02:41:45 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 11 02:41:45 2019 +0000
tree 1bd9adafd4a2b78bd378aec61c08699c4c554d83
parent 2f69bc46052a5120f34b64c348aa5dcbb20373e4
parent 7a597f572b27ba37f5ec92a6a03524bcd82a7a35

Merge "Change all cf_common paths to cuttlefish paths"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 520ff13..b2a400c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1744,9 +1744,9 @@
   endif
 
   # Put XML formatted API files in the dist dir.
-  $(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-header-files,android_stubs_current) $(APICHECK)
-  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-header-files,android_system_stubs_current) $(APICHECK)
-  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-header-files,android_test_stubs_current) $(APICHECK)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,android_stubs_current) $(APICHECK)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)
+  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_stubs_current) $(APICHECK)
 
   api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml)
   $(api_xmls):

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 98da3fc..e6818b9 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -63,6 +63,7 @@
     com.android.resolv \
     com.android.neuralnetworks \
     com.android.sdkext \
+    com.android.telephony \
     com.android.tzdata \
     com.android.wifi \
     ContactsProvider \
@@ -101,7 +102,6 @@
     idmap2 \
     idmap2d \
     ime \
-    ims-common \
     incident \
     incidentd \
     incident_helper \
@@ -259,7 +259,6 @@
     task_profiles.json \
     tc \
     telecom \
-    telephony-common \
     tombstoned \
     traced \
     traced_probes \
@@ -338,7 +337,9 @@
     com.android.conscrypt:conscrypt \
     com.android.ipsec:ike \
     com.android.media:updatable-media \
-    com.android.sdkext:framework-sdkext
+    com.android.sdkext:framework-sdkext \
+    com.android.telephony:telephony-common \
+    com.android.telephony:ims-common
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \

target/product/gsi/current.txt

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 9bb1100..3130813 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -205,6 +205,7 @@
 VNDK-core: android.hardware.weaver@1.0.so
 VNDK-core: android.hardware.wifi.hostapd@1.0.so
 VNDK-core: android.hardware.wifi.hostapd@1.1.so
+VNDK-core: android.hardware.wifi.hostapd@1.2.so
 VNDK-core: android.hardware.wifi.offload@1.0.so
 VNDK-core: android.hardware.wifi.supplicant@1.0.so
 VNDK-core: android.hardware.wifi.supplicant@1.1.so