n1: Update extraction stuff

 * If item is prefixed with "-", don't dump it into PRODUCT_COPY_FILES
 * Add postprocessing stuff.

3 files changed, 48 insertions, 11 deletions

diff --git a/extract-files.sh b/extract-files.sh
index 4d742a1..63d3359 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -8,7 +8,7 @@ rm -rf $BASE/*
 
 for FILE in `egrep -v '(^#|^$)' proprietary-files.txt`; do
     OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
-    FILE=${PARSING_ARRAY[0]}
+    FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
     DEST=${PARSING_ARRAY[1]}
     if [ -z $DEST ]
     then
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9aa4313..cb90e84 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -41,7 +41,7 @@ lib/libmmstillomx.so
 lib/liboemcamera.so
 
 # GPS
-app/com.qualcomm.location.apk
+-app/com.qualcomm.location.apk
 bin/gsiff_daemon
 etc/permissions/com.qualcomm.location.xml
 lib/libgps.utils.so
@@ -161,17 +161,18 @@ vendor/lib/drm/libdrmwvmplugin.so
 vendor/lib/mediadrm/libwvdrmengine.so
 
 # Misc
-vendor/lib/libqc-opt.so
+-vendor/lib/libqc-opt.so
 lib/libadsprpc.so
 
-# CABL
+# Postprocessing
+-app/PPPreference.apk
 bin/mm-pp-daemon
 lib/libmm-abl.so
 lib/libmm-abl-oem.so
 
 # Time services
 bin/time_daemon
-lib/libtime_genoff.so
+-lib/libtime_genoff.so
 
 # Keystore
 vendor/firmware/keymaster/keymaster.b00
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 3edd375..a0327ca 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -36,12 +36,14 @@ for FILE in `egrep -v '(^#|^$)' ../$DEVICE/proprietary-files.txt`; do
     fi
     # Split the file from the destination (format is "file[:destination]")
     OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
-    FILE=${PARSING_ARRAY[0]}
-    DEST=${PARSING_ARRAY[1]}
-    if [ -n "$DEST" ]; then
-        FILE=$DEST
+    if [[ ! "$FILE" =~ ^-.* ]]; then
+        FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
+        DEST=${PARSING_ARRAY[1]}
+        if [ -n "$DEST" ]; then
+            FILE=$DEST
+        fi
+        echo "    $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE
     fi
-    echo "    $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE
 done
 
 (cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.mk
@@ -64,7 +66,11 @@ done
 # Pick up overlay for features that depend on non-open-source files
 DEVICE_PACKAGE_OVERLAYS += vendor/$VENDOR/$DEVICE/overlay
 
-PRODUCT_PACKAGES += libtime_genoff
+PRODUCT_PACKAGES += \\
+    libtime_genoff \\
+    libqc-opt \\
+    com.qualcomm.location \\
+    PPPreference
 
 \$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk)
 EOF
@@ -118,6 +124,36 @@ LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include \$(BUILD_PREBUILT)
 
+include \$(CLEAR_VARS)
+LOCAL_MODULE := libqc-opt
+LOCAL_MODULE_OWNER := oppo
+LOCAL_SRC_FILES := proprietary/vendor/lib/libqc-opt.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := \$(TARGET_OUT_VENDOR)/lib
+include \$(BUILD_PREBUILT)
+
+include \$(CLEAR_VARS)
+LOCAL_MODULE := PPPreference
+LOCAL_MODULE_OWNER := oppo
+LOCAL_SRC_FILES := proprietary/app/PPPreference.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include \$(BUILD_PREBUILT)
+
+include \$(CLEAR_VARS)
+LOCAL_MODULE := com.qualcomm.location
+LOCAL_MODULE_OWNER := oppo
+LOCAL_SRC_FILES := proprietary/app/com.qualcomm.location.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include \$(BUILD_PREBUILT)
+
 endif
 
 EOF