Revert "FR59664: Move apks to system_ext partition"
This reverts commit c736685298fe1707531004ba8316032104617af7
Change-Id: I3298b5f3379675e5d6739239593264687a149434
CRs-Fixed: 2622329
diff --git a/qti-hidl-wrapper/Android.bp b/qti-hidl-wrapper/Android.bp
index 4b0d403..05c047c 100644
--- a/qti-hidl-wrapper/Android.bp
+++ b/qti-hidl-wrapper/Android.bp
@@ -3,7 +3,7 @@
name: "qti-telephony-hidl-wrapper",
installable: true,
- system_ext_specific: true,
+ product_specific: true,
static_libs: [
"android.hidl.base-V1.0-java",
@@ -18,9 +18,9 @@
name: "qti_telephony_hidl_wrapper.xml",
- // This will install the file in /system_ext/etc/permissions
+ // This will install the file in /product/etc/permissions
src: "qti_telephony_hidl_wrapper.xml",
sub_dir: "permissions",
- system_ext_specific: true,
+ product_specific: true,
}
diff --git a/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml b/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
index ccf6358..dc9ba2c 100644
--- a/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
+++ b/qti-hidl-wrapper/qti_telephony_hidl_wrapper.xml
@@ -31,5 +31,5 @@
<permissions>
<library name="qti-telephony-hidl-wrapper"
- file="/system_ext/framework/qti-telephony-hidl-wrapper.jar"/>
+ file="/product/framework/qti-telephony-hidl-wrapper.jar"/>
</permissions>
diff --git a/qti-utils/Android.bp b/qti-utils/Android.bp
index 96a30d0..51d3fdf 100644
--- a/qti-utils/Android.bp
+++ b/qti-utils/Android.bp
@@ -4,7 +4,7 @@
installable: true,
srcs: ["src/org/**/*.java"],
- system_ext_specific: true,
+ product_specific: true,
}
@@ -14,11 +14,11 @@
name: "qti_telephony_utils.xml",
- // This will install the file in /system_ext/etc/permissions
+ // This will install the file in /product/etc/permissions
//
src: "qti_telephony_utils.xml",
sub_dir: "permissions",
- system_ext_specific: true,
+ product_specific: true,
-}
+}
\ No newline at end of file
diff --git a/qti-utils/qti_telephony_utils.xml b/qti-utils/qti_telephony_utils.xml
index 8b9736b..e2820fc 100644
--- a/qti-utils/qti_telephony_utils.xml
+++ b/qti-utils/qti_telephony_utils.xml
@@ -29,5 +29,5 @@
-->
<permissions>
<library name="qti-telephony-utils"
- file="/system_ext/framework/qti-telephony-utils.jar"/>
+ file="/product/framework/qti-telephony-utils.jar"/>
</permissions>