Allow building inline without Google SuW and Velvet
* And remove Velvet for low-ram devices
此提交包含在:
@@ -72,8 +72,9 @@ unzip -o "$ZIP"
|
|||||||
exec_util "rm -rf META-INF"
|
exec_util "rm -rf META-INF"
|
||||||
cd system
|
cd system
|
||||||
if [ "$MEM" -lt "$LOWMEM" ]; then
|
if [ "$MEM" -lt "$LOWMEM" ]; then
|
||||||
ui_print "Low RAM device detected, removing Google SuW"
|
ui_print "Low RAM device detected, removing large extras"
|
||||||
exec_util "rm -rf priv-app/SetupWizard"
|
exec_util "rm -rf priv-app/SetupWizard"
|
||||||
|
exec_util "rm -rf priv-app/Velvet"
|
||||||
fi
|
fi
|
||||||
ui_print "Generating addon.d file"
|
ui_print "Generating addon.d file"
|
||||||
cat addon.d/addond_head > addon.d/30-gapps.sh
|
cat addon.d/addond_head > addon.d/30-gapps.sh
|
||||||
|
@@ -135,6 +135,17 @@ LOCAL_MODULE_SUFFIX := .apk
|
|||||||
LOCAL_PRIVILEGED_MODULE := true
|
LOCAL_PRIVILEGED_MODULE := true
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := com.google.android.maps
|
||||||
|
LOCAL_MODULE_OWNER := gapps
|
||||||
|
LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar
|
||||||
|
LOCAL_CERTIFICATE := PRESIGNED
|
||||||
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
||||||
|
LOCAL_MODULE_SUFFIX := .jar
|
||||||
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
|
ifeq ($(TARGET_IS_GROUPER),)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := SetupWizard
|
LOCAL_MODULE := SetupWizard
|
||||||
LOCAL_MODULE_OWNER := gapps
|
LOCAL_MODULE_OWNER := gapps
|
||||||
@@ -159,14 +170,5 @@ LOCAL_MODULE_SUFFIX := .apk
|
|||||||
LOCAL_PRIVILEGED_MODULE := true
|
LOCAL_PRIVILEGED_MODULE := true
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
endif
|
||||||
LOCAL_MODULE := com.google.android.maps
|
|
||||||
LOCAL_MODULE_OWNER := gapps
|
|
||||||
LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar
|
|
||||||
LOCAL_CERTIFICATE := PRESIGNED
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
|
||||||
LOCAL_MODULE_SUFFIX := .jar
|
|
||||||
include $(BUILD_PREBUILT)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@@ -30,6 +30,10 @@ PRODUCT_PACKAGES += \
|
|||||||
GooglePartnerSetup \
|
GooglePartnerSetup \
|
||||||
GoogleServicesFramework \
|
GoogleServicesFramework \
|
||||||
Phonesky \
|
Phonesky \
|
||||||
SetupWizard \
|
|
||||||
Velvet \
|
|
||||||
com.google.android.maps
|
com.google.android.maps
|
||||||
|
ifeq ($(TARGET_IS_GROUPER),)
|
||||||
|
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
SetupWizard \
|
||||||
|
Velvet
|
||||||
|
endif
|
||||||
|
@@ -45,5 +45,6 @@ fi
|
|||||||
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT"
|
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT"
|
||||||
|
|
||||||
extract "$MY_DIR"/proprietary-files-common.txt "$SRC"
|
extract "$MY_DIR"/proprietary-files-common.txt "$SRC"
|
||||||
|
extract "$MY_DIR"/proprietary-files-common-nongrouper.txt "$SRC"
|
||||||
|
|
||||||
"$MY_DIR"/setup-makefiles.sh
|
"$MY_DIR"/setup-makefiles.sh
|
||||||
|
@@ -0,0 +1,2 @@
|
|||||||
|
-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
|
||||||
|
-priv-app/Velvet/Velvet.apk;PRESIGNED
|
@@ -9,8 +9,6 @@
|
|||||||
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
|
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
|
||||||
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
|
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
|
||||||
-priv-app/Phonesky/Phonesky.apk;PRESIGNED
|
-priv-app/Phonesky/Phonesky.apk;PRESIGNED
|
||||||
-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
|
|
||||||
-priv-app/Velvet/Velvet.apk;PRESIGNED
|
|
||||||
|
|
||||||
-framework/com.google.android.maps.jar;PRESIGNED
|
-framework/com.google.android.maps.jar;PRESIGNED
|
||||||
|
|
||||||
|
@@ -45,6 +45,13 @@ write_headers "arm arm64 x86"
|
|||||||
# Common gapps
|
# Common gapps
|
||||||
write_makefiles "$MY_DIR"/proprietary-files-common.txt
|
write_makefiles "$MY_DIR"/proprietary-files-common.txt
|
||||||
|
|
||||||
|
# Gapps that are too large for grouper
|
||||||
|
echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
|
||||||
|
echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
|
||||||
|
write_makefiles "$MY_DIR"/proprietary-files-common-nongrouper.txt
|
||||||
|
echo "endif" >> "$PRODUCTMK"
|
||||||
|
echo "endif" >> "$ANDROIDMK"
|
||||||
|
|
||||||
sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
|
sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
|
||||||
|
|
||||||
# We are done with common
|
# We are done with common
|
||||||
|
新增問題並參考
封鎖使用者