summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-08-10 07:07:19 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-08-10 07:07:19 +0400
commit5961dda6a6a5bbd1d119644e0735ada501628196 (patch)
treec88c85db1e79b7c3e15e7bd2852b3aa7b7f38563
parented7f014263195d6bbb4983a6bb02ac2251e47299 (diff)
parente4ff7a1a53a06eeb1799ad492dae5bb760634f34 (diff)
downloadvendor_replicant-5961dda6a6a5bbd1d119644e0735ada501628196.zip
vendor_replicant-5961dda6a6a5bbd1d119644e0735ada501628196.tar.gz
vendor_replicant-5961dda6a6a5bbd1d119644e0735ada501628196.tar.bz2
Merge "cm: Use prebuilt Superuser" into ics
-rw-r--r--config/common.mk5
-rw-r--r--prebuilt/common/apps/Superuser.apkbin0 -> 1511570 bytes
2 files changed, 2 insertions, 3 deletions
diff --git a/config/common.mk b/config/common.mk
index 006eacd..6a0ab80 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -53,7 +53,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
vendor/cm/proprietary/Term.apk:system/app/Term.apk \
- vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+ vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so \
+ vendor/cm/prebuilt/common/apps/Superuser.apk:system/app/Superuser.apk
# Bring in camera effects
PRODUCT_COPY_FILES += \
@@ -81,8 +82,6 @@ PRODUCT_PACKAGES += \
Development \
LatinIME \
SpareParts \
- Superuser \
- Superuser.apk \
su
# Optional CM packages
diff --git a/prebuilt/common/apps/Superuser.apk b/prebuilt/common/apps/Superuser.apk
new file mode 100644
index 0000000..a550070
--- /dev/null
+++ b/prebuilt/common/apps/Superuser.apk
Binary files differ