commit 559cb6b5b725803c3faa87e14a5f7f474c1a5a51
author android-build-team Robot <android-build-team-robot@google.com> Thu May 14 07:00:41 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 14 07:00:41 2020 +0000
tree 1a203fc1898a68bc9826a38aae7e4883547725b9
parent c0ba27a9206dcd34e481a43412b527c8c9b054e0
parent 7d2ed5617c51a86eb6d2d9424e09624aa1ae47ee

Snap for 6493843 from 7d2ed5617c51a86eb6d2d9424e09624aa1ae47ee to mainline-release

Change-Id: Ica8a59dfbb6fbb86a79cbf3570a325609ecf4261

Android.bp

diff --git a/Android.bp b/Android.bp
index b5498d5..def7cde 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,7 @@
     name: "TelephonyProvider",
     privileged: true,
     srcs: ["src/**/*.java", "proto/**/*.proto"],
+    asset_dirs: ["assets/latest_carrier_id"],
     platform_apis: true,
     certificate: "platform",
     libs: ["telephony-common"],
@@ -10,5 +11,5 @@
 
 filegroup {
     name: "telephonyprovider-assets-carrierlist",
-    srcs: ["assets/carrier_list.*"],
+    srcs: ["assets/latest_carrier_id/carrier_list.*"],
 }

assets/latest_carrier_id/carrier_list.pb

diff --git a/assets/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb
similarity index 100%
rename from assets/carrier_list.pb
rename to assets/latest_carrier_id/carrier_list.pb
Binary files differ

assets/latest_carrier_id/carrier_list.textpb

diff --git a/assets/carrier_list.textpb b/assets/latest_carrier_id/carrier_list.textpb
similarity index 100%
rename from assets/carrier_list.textpb
rename to assets/latest_carrier_id/carrier_list.textpb
Binary files differ