commit 2d958cdde135d5b12dfbab3b75d2637eb41caedf
author Meng Wang <mewan@google.com> Thu Nov 14 11:22:14 2019 -0800
committer Meng Wang <mewan@google.com> Thu Jan 09 12:08:47 2020 -0800
tree 31eccaf1296a3f5a2b675018a6789d37830940f0
parent bdb0d60d1c419c982862fa50e8660d1f8e23d619

Link PlatformProperties statically

Use jarjar rule to prevent class duplication.

Bug: 141246285
Test: make
Change-Id: I362495413bab10969732fd9c3fd6ca02b5bcd6fb

Android.bp

diff --git a/Android.bp b/Android.bp
index 0ff7f0f..fc43fda 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,7 @@
     ],
     path: "src/java",
 }
+
 filegroup {
     name: "jarjar-rules-shared",
     srcs: ["jarjar-rules-shared.txt"],
@@ -74,6 +75,7 @@
         "android.hardware.radio.deprecated-V1.0-java-shallow",
         "ecc-protos-lite",
         "libphonenumber-nogeocoder",
+        "PlatformProperties",
         "telephony-protos",
     ],
 
@@ -84,4 +86,3 @@
         },
     },
 }
-

jarjar-rules-shared.txt

diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 4363eac..726f4b7 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -1,6 +1,7 @@
 rule android.os.RegistrantList* com.android.internal.telephony.RegistrantList@1
 rule android.os.Registrant* com.android.internal.telephony.Registrant@1
 rule android.hidl.** android.internal.hidl.@1
+rule android.sysprop.** android.internal.telephony.sysprop.@1
 rule android.util.LocalLog* com.android.internal.telephony.LocalLog@1
 rule android.util.TimeUtils* com.android.internal.telephony.TimeUtils@1
 rule com.android.internal.os.SomeArgs* com.android.internal.telephony.SomeArgs@1