Seth/OrangeFox-Builder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
Carlo Dandan
2022-10-25 02:11:19 +08:00
committed by GitHub
parent 2fde1d1537
commit ae4ce69731
7 changed files with 996 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sync/patches/patch-manifest-fox_10.0.diff
+168
View File
@@ -0,0 +1,168 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -1932,7 +1932,33 @@ define build-recoveryramdisk
# Copying baseline ramdisk...
# Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac.
$(hide) rsync -a --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
+
# Modifying ramdisk contents...
+
+# Darth9
+#ifneq ($(NOT_ORANGEFOX),1)
+ $(if $(filter 1,$(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)), \
+ $(hide) $(FOX_VENDOR) \
+ FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ FOX_MANIFEST_VER="10.0" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)" \
+ recovery_uncompressed_ramdisk="$(recovery_uncompressed_ramdisk)")
+#endif
+# Darth9
+
$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),, \
$(hide) ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init)
$(if $(BOARD_RECOVERY_KERNEL_MODULES), \
@@ -2024,6 +2050,31 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(call build-recoveryramdisk)
$(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(RECOVERY_RAMDISK_COMPRESSOR) > $(recovery_ramdisk)
$(call build-recoveryimage-target, $@)
+
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="10.0" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ INSTALLED_BOOTIMAGE_TARGET="$(INSTALLED_BOOTIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+# Darth9
+
endif # BOARD_USES_RECOVERY_AS_BOOT
ifdef BOARD_INCLUDE_RECOVERY_DTBO
@@ -2090,6 +2141,22 @@ endif
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9 # FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER
+ifneq ($(NOT_ORANGEFOX),1)
+ ifeq ($(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="10.0" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)"
+ #else
+ #$(BASH) $(FOX_VENDOR)
+ endif
+endif
+# Darth9
+
ifneq ($(BOARD_NAND_PAGE_SIZE),)
$(error MTD device is no longer supported and thus BOARD_NAND_PAGE_SIZE is deprecated.)
endif
@@ -3222,6 +3289,10 @@ endif
# Appends os version and security patch level as a AVB property descriptor
+BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS += \
+ --prop com.android.build.boot.os_version:$(PLATFORM_VERSION) \
+ --prop com.android.build.boot.security_patch:$(PLATFORM_SECURITY_PATCH)
+
BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \
--prop com.android.build.system.os_version:$(PLATFORM_VERSION) \
--prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH)
diff --git a/core/board_config.mk b/core/board_config.mk
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -177,8 +177,10 @@ endif
# Sanity check to warn about likely cryptic errors later in the build.
ifeq ($(TARGET_IS_64_BIT),true)
ifeq (,$(filter true false,$(TARGET_SUPPORTS_64_BIT_APPS)))
- $(warning Building a 32-bit-app-only product on a 64-bit device. \
- If this is intentional, set TARGET_SUPPORTS_64_BIT_APPS := false)
+# --- Darth9: this spues out a nonsensical warning; so, stop the spamming
+# $(warning Building a 32-bit-app-only product on a 64-bit device. \
+# If this is intentional, set TARGET_SUPPORTS_64_BIT_APPS := false)
+# --- Darth9
endif
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -637,6 +637,19 @@ else
MD5SUM:=md5sum
endif
+# Darth9
+# OrangeFox post script
+FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+else
+ FOX_VENDOR := vendor/recovery/OrangeFox.sh
+ BASH := bash
+ FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER := 1
+endif
+# Darth9
+
APICHECK_COMMAND := $(JAVA) -Xmx4g -jar $(APICHECK) --no-banner --compatible-output=yes
# Boolean variable determining if the whitelist for compatible properties is enabled
@@ -898,7 +911,7 @@ $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \
)
# BOARD_*_PARTITION_LIST: a list of the following tokens
-valid_super_partition_list := system vendor product product_services odm
+valid_super_partition_list := system vendor product system_ext product_services odm
$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \
$(if $(filter-out $(valid_super_partition_list),$(BOARD_$(group)_PARTITION_LIST)), \
$(error BOARD_$(group)_PARTITION_LIST contains invalid partition name \
diff --git a/core/main.mk b/core/main.mk
--- a/core/main.mk
+++ b/core/main.mk
@@ -285,11 +285,11 @@ enable_target_debugging := true
tags_to_install :=
ifneq (,$(user_variant))
# Target is secure in user builds.
- ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),user)
- ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=0
endif
ifeq ($(user_variant),userdebug)
sync/patches/patch-manifest-fox_11.0.diff
+184
View File
@@ -0,0 +1,184 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -2224,6 +2224,30 @@ $(recovery_uncompressed_ramdisk): $(MKBOOTFS) \
# Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac.
rsync -a --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
# Modifying ramdisk contents...
+
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ FOX_MANIFEST_VER="11.0" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+# Darth9
+
$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),, \
ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init)
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
@@ -2310,6 +2334,31 @@ ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
$(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps)
$(call pretty,"Target boot image from recovery: $@")
$(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@))))
+
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="11.0" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ INSTALLED_BOOTIMAGE_TARGET="$(INSTALLED_BOOTIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+# Darth9
+
endif # BOARD_USES_RECOVERY_AS_BOOT
ifndef BOARD_CUSTOM_BOOTIMG_MK
@@ -2338,6 +2387,32 @@ endif # BUILDING_RECOVERY_IMAGE
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="11.0" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ INSTALLED_BOOTIMAGE_TARGET="$(INSTALLED_BOOTIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+endif
+# Darth9
+
ifneq ($(BOARD_NAND_PAGE_SIZE),)
$(error MTD device is no longer supported and thus BOARD_NAND_PAGE_SIZE is deprecated.)
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -670,6 +670,18 @@ EXTRACT_KERNEL := build/make/tools/extract_kernel.py
# Path to tools.jar
HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar
+# Darth9
+# OrangeFox post script
+FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+else
+ FOX_VENDOR := vendor/recovery/OrangeFox_A11.sh
+ BASH := bash
+endif
+# Darth9
+
APICHECK_COMMAND := $(JAVA) -Xmx4g -jar $(APICHECK) --no-banner --compatible-output=yes
# Boolean variable determining if the allow list for compatible properties is enabled
diff --git a/make/envsetup.sh b/make/envsetup.sh
--- a/make/envsetup.sh
+++ b/make/envsetup.sh
@@ -327,6 +327,14 @@ function printconfig()
return
fi
get_build_var report_config
+
+ # Darth9
+ if [ "$NOT_ORANGEFOX" != "1" ]; then
+ local DEVICE=$(cut -d'_' -f2 <<<$TARGET_PRODUCT)
+ mkdir -p /tmp/$DEVICE
+ export > /tmp/$DEVICE/fox_env.sh
+ fi
+ # Darth9
}
function set_stuff_for_environment()
@@ -1629,3 +1637,44 @@ addcompletions
export ANDROID_BUILD_TOP=$(gettop)
. $ANDROID_BUILD_TOP/vendor/twrp/build/envsetup.sh
+
+# Darth9
+# prepare environment variables for importing to OrangeFox_A11.sh
+function orangefox_envsetup() {
+
+ export FOX_MANIFEST_ROOT=$(gettop)
+
+ if [ -z "$NOT_ORANGEFOX" ]; then
+ if [ ! -f $FOX_MANIFEST_ROOT/bootable/recovery/orangefox_defaults.go -a ! -f $FOX_MANIFEST_ROOT/bootable/recovery/orangefox.mk ]; then
+ export NOT_ORANGEFOX=1
+ fi
+ fi
+
+ if [ "$NOT_ORANGEFOX" = "1" ]; then
+ echo "- Not OrangeFox! ..."
+ return
+ fi
+
+ unset NOT_ORANGEFOX
+ export ALLOW_MISSING_DEPENDENCIES=true
+
+ if [ -z "$OUT_DIR" ]; then
+ if [ -n "$OUT" ]; then
+ export OUT_DIR="$OUT"
+ else
+ export OUT_DIR="$FOX_MANIFEST_ROOT/out"
+ export OUT="$OUT_DIR"
+ fi
+ else
+ if [ -z "$OUT" ]; then
+ export OUT="$OUT_DIR"
+ fi
+ fi
+ # export OF_MANUAL_COPY_TWRES=1
+ [ -s $FOX_MANIFEST_ROOT/frameworks/base/services/core/xsd/vts/Android.mk ] && echo -n "" > $FOX_MANIFEST_ROOT/frameworks/base/services/core/xsd/vts/Android.mk
+}
+
+orangefox_envsetup
+
+# Darth9
+#
sync/patches/patch-manifest-fox_12.1.diff
+184
View File
@@ -0,0 +1,184 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -2236,6 +2236,30 @@ $(INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP): $(MKBOOTFS) \
# Use rsync because "cp -Rf" fails to overwrite broken symlinks on Mac.
rsync -a --exclude=sdcard $(IGNORE_RECOVERY_SEPOLICY) $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
# Modifying ramdisk contents...
+
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ FOX_MANIFEST_VER="12.1" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+# Darth9
+
$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),, \
ln -sf /system/bin/init $(TARGET_RECOVERY_ROOT_OUT)/init)
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
@@ -2330,6 +2354,31 @@ $(foreach b,$(INSTALLED_BOOTIMAGE_TARGET), $(eval $(call add-dependency,$(b),$(c
$(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps)
$(call pretty,"Target boot image from recovery: $@")
$(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@))))
+
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="12.1" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ INSTALLED_BOOTIMAGE_TARGET="$(INSTALLED_BOOTIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+# Darth9
+
endif # BOARD_USES_RECOVERY_AS_BOOT
ifndef BOARD_CUSTOM_BOOTIMG_MK
@@ -2360,6 +2409,32 @@ endif # BUILDING_RECOVERY_IMAGE
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9
+ifneq ($(NOT_ORANGEFOX),1)
+ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="12.1" \
+ BOARD_BOOT_HEADER_VERSION="$(BOARD_BOOT_HEADER_VERSION)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS='"$(BOARD_MKBOOTIMG_ARGS)"' \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ INSTALLED_BOOTIMAGE_TARGET="$(INSTALLED_BOOTIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ BOARD_USES_RECOVERY_AS_BOOT=$(BOARD_USES_RECOVERY_AS_BOOT) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)"
+endif
+endif
+# Darth9
+
ifneq ($(BOARD_NAND_PAGE_SIZE),)
$(error MTD device is no longer supported and thus BOARD_NAND_PAGE_SIZE is deprecated.)
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -606,6 +606,18 @@ EXTRACT_KERNEL := build/make/tools/extract_kernel.py
# Path to tools.jar
HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar
+# Darth9
+# OrangeFox post script
+FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+else
+ FOX_VENDOR := vendor/recovery/OrangeFox_A12.sh
+ BASH := bash
+endif
+# Darth9
+
APICHECK_COMMAND := $(JAVA) -Xmx4g -jar $(APICHECK) --no-banner --compatible-output=no
# Boolean variable determining if the allow list for compatible properties is enabled
diff --git a/make/envsetup.sh b/make/envsetup.sh
--- a/make/envsetup.sh
+++ b/make/envsetup.sh
@@ -353,6 +353,14 @@ function printconfig()
return
fi
get_build_var report_config
+
+ # Darth9
+ if [ "$NOT_ORANGEFOX" != "1" ]; then
+ local DEVICE=$(cut -d'_' -f2 <<<$TARGET_PRODUCT)
+ mkdir -p /tmp/$DEVICE
+ export > /tmp/$DEVICE/fox_env.sh
+ fi
+ # Darth9
}
function set_stuff_for_environment()
@@ -1873,3 +1881,44 @@ addcompletions
export ANDROID_BUILD_TOP=$(gettop)
. $ANDROID_BUILD_TOP/vendor/twrp/build/envsetup.sh
+
+# Darth9
+# prepare environment variables for importing to OrangeFox_A12.sh
+function orangefox_envsetup() {
+
+ export FOX_MANIFEST_ROOT=$(gettop)
+
+ if [ -z "$NOT_ORANGEFOX" ]; then
+ if [ ! -f $FOX_MANIFEST_ROOT/bootable/recovery/orangefox_defaults.go -a ! -f $FOX_MANIFEST_ROOT/bootable/recovery/orangefox.mk ]; then
+ export NOT_ORANGEFOX=1
+ fi
+ fi
+
+ if [ "$NOT_ORANGEFOX" = "1" ]; then
+ echo "- Not OrangeFox! ..."
+ return
+ fi
+
+ unset NOT_ORANGEFOX
+ export ALLOW_MISSING_DEPENDENCIES=true
+
+ if [ -z "$OUT_DIR" ]; then
+ if [ -n "$OUT" ]; then
+ export OUT_DIR="$OUT"
+ else
+ export OUT_DIR="$FOX_MANIFEST_ROOT/out"
+ export OUT="$OUT_DIR"
+ fi
+ else
+ if [ -z "$OUT" ]; then
+ export OUT="$OUT_DIR"
+ fi
+ fi
+ # export OF_MANUAL_COPY_TWRES=1
+ [ -s $FOX_MANIFEST_ROOT/frameworks/base/services/core/xsd/vts/Android.mk ] && echo -n "" > $FOX_MANIFEST_ROOT/frameworks/base/services/core/xsd/vts/Android.mk
+}
+
+orangefox_envsetup
+
+# Darth9
+#
sync/patches/patch-manifest-fox_6.0.diff
+168
View File
@@ -0,0 +1,168 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -119,7 +119,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
echo "#" >> $@;
$(hide) echo ro.bootimage.build.date=`date`>>$@
$(hide) echo ro.bootimage.build.date.utc=`date +%s`>>$@
- $(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT)">>$@
+# Darth9 $(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT)">>$@
$(hide) build/tools/post_process_props.py $@
# -----------------------------------------------------------------
@@ -154,20 +154,22 @@ BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
build_desc := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER) $(BUILD_VERSION_TAGS)
$(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)
+# Darth9
# The string used to uniquely identify the combined build and product; used by the OTA server.
-ifeq (,$(strip $(BUILD_FINGERPRINT)))
- ifneq ($(filter eng.%,$(BUILD_NUMBER)),)
- # Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed
- # the Android system property length limit (PROPERTY_VALUE_MAX=92).
- BF_BUILD_NUMBER := $(USER)$(shell date +%m%d%H%M)
- else
- BF_BUILD_NUMBER := $(BUILD_NUMBER)
- endif
- BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
-endif
-ifneq ($(words $(BUILD_FINGERPRINT)),1)
- $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
-endif
+#ifeq (,$(strip $(BUILD_FINGERPRINT)))
+# ifneq ($(filter eng.%,$(BUILD_NUMBER)),)
+# # Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed
+# # the Android system property length limit (PROPERTY_VALUE_MAX=92).
+# BF_BUILD_NUMBER := $(USER)$(shell date +%m%d%H%M)
+# else
+# BF_BUILD_NUMBER := $(BUILD_NUMBER)
+# endif
+# BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
+#endif
+#ifneq ($(words $(BUILD_FINGERPRINT)),1)
+# $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
+#endif
+# Darth9
# The string used to uniquely identify the system build; used by the OTA server.
# This purposefully excludes any product-specific variables.
@@ -250,7 +252,7 @@ endif
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \
- BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \
+# Darth9 BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \
$(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT)") \
TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \
@@ -309,7 +311,7 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(INSTALLED_BUILD_PROP_TARGET)
$(hide) echo > $@
$(hide) echo ro.vendor.build.date=`date`>>$@
$(hide) echo ro.vendor.build.date.utc=`date +%s`>>$@
- $(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT)">>$@
+# Darth9 $(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT)">>$@
endif
# ----------------------------------------------------------------
@@ -934,6 +936,31 @@ define build-recoveryramdisk
@echo -e ${PRT_IMG}"Copying baseline ramdisk..."${CL_RST}
$(hide) rsync -a $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
@echo -e ${PRT_IMG}"Modifying ramdisk contents..."${CL_RST}
+
+
+# Darth9
+#ifneq ($(NOT_ORANGEFOX),1)
+ $(if $(filter 1,$(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)), \
+ $(hide) $(FOX_VENDOR) \
+ FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS="$(BOARD_MKBOOTIMG_ARGS)" \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)" \
+ recovery_uncompressed_ramdisk="$(recovery_uncompressed_ramdisk)")
+#endif
+# Darth9
+
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
@@ -1010,6 +1037,21 @@ endif
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9 # FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER
+ifneq ($(NOT_ORANGEFOX),1)
+ ifeq ($(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)"
+ else
+ $(BASH) $(FOX_VENDOR)
+ endif
+endif
+# Darth9
+
ifeq ($(BOARD_NAND_PAGE_SIZE),)
BOARD_NAND_PAGE_SIZE := 2048
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -524,6 +524,19 @@ else
MD5SUM:=md5sum
endif
+# Darth9
+# OrangeFox post script
+ FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+else
+ export FOX_VENDOR=vendor/recovery/OrangeFox.sh
+ export BASH=bash
+ export FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER=1
+endif
+# Darth9
+
# In-place sed is done different in linux than OS X
ifeq ($(HOST_OS),darwin)
GSED:=$(shell which gsed)
diff --git a/core/main.mk b/core/main.mk
--- a/core/main.mk
+++ b/core/main.mk
@@ -278,7 +278,7 @@ enable_target_debugging := true
tags_to_install :=
ifneq (,$(user_variant))
# Target is secure in user builds.
- ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),userdebug)
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -50,7 +50,7 @@ if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then
echo "ro.product.device=$TARGET_DEVICE"
echo "# Do not try to parse description, fingerprint, or thumbprint"
echo "ro.build.description=$PRIVATE_BUILD_DESC"
- echo "ro.build.fingerprint=$BUILD_FINGERPRINT"
+# Darth9 echo "ro.build.fingerprint=$BUILD_FINGERPRINT"
if [ -n "$BUILD_THUMBPRINT" ] ; then
echo "ro.build.thumbprint=$BUILD_THUMBPRINT"
fi
sync/patches/patch-manifest-fox_7.1.diff
+179
View File
@@ -0,0 +1,179 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -95,7 +95,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop)
echo "#" >> $@;
$(hide) echo ro.bootimage.build.date=`$(DATE_FROM_FILE)`>>$@
$(hide) echo ro.bootimage.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@
- $(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
+# Darth9 $(hide) echo ro.bootimage.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
$(hide) build/tools/post_process_props.py $@
# -----------------------------------------------------------------
@@ -130,23 +130,26 @@ BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
build_desc := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS)
$(intermediate_system_build_prop): PRIVATE_BUILD_DESC := $(build_desc)
-# The string used to uniquely identify the combined build and product; used by the OTA server.
-ifeq (,$(strip $(BUILD_FINGERPRINT)))
- ifneq ($(filter eng.%,$(BUILD_NUMBER)),)
- # Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed
- # the Android system property length limit (PROPERTY_VALUE_MAX=92).
- BF_BUILD_NUMBER := $(shell echo $${USER:0:6})$(shell $(DATE) +%m%d%H%M)
- else
- BF_BUILD_NUMBER := $(BUILD_NUMBER)
- endif
- BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
-endif
-ifneq ($(words $(BUILD_FINGERPRINT)),1)
- $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
-endif
-
-$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) > $(PRODUCT_OUT)/build_fingerprint.txt)
-BUILD_FINGERPRINT_FROM_FILE := $$(cat $(PRODUCT_OUT)/build_fingerprint.txt)
+# Darth9
+## The string used to uniquely identify the combined build and product; used by the OTA server.
+#ifeq (,$(strip $(BUILD_FINGERPRINT)))
+# ifneq ($(filter eng.%,$(BUILD_NUMBER)),)
+# # Trim down BUILD_FINGERPRINT: the default BUILD_NUMBER makes it easily exceed
+# # the Android system property length limit (PROPERTY_VALUE_MAX=92).
+# BF_BUILD_NUMBER := $(shell echo $${USER:0:6})$(shell $(DATE) +%m%d%H%M)
+# else
+# BF_BUILD_NUMBER := $(BUILD_NUMBER)
+# endif
+# BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
+#endif
+#
+#ifneq ($(words $(BUILD_FINGERPRINT)),1)
+# $(error BUILD_FINGERPRINT cannot contain spaces: "$(BUILD_FINGERPRINT)")
+#endif
+#
+#$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) > $(PRODUCT_OUT)/build_fingerprint.txt)
+#BUILD_FINGERPRINT_FROM_FILE := $$(cat $(PRODUCT_OUT)/build_fingerprint.txt)
+# Darth9
# The string used to uniquely identify the system build; used by the OTA server.
# This purposefully excludes any product-specific variables.
@@ -238,7 +241,7 @@ endif
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \
- BUILD_FINGERPRINT="$(BUILD_FINGERPRINT_FROM_FILE)" \
+# Darth9 BUILD_FINGERPRINT="$(BUILD_FINGERPRINT_FROM_FILE)" \
$(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT)") \
TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \
@@ -296,7 +299,7 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(INSTALLED_BUILD_PROP_TARGET)
$(hide) echo > $@
$(hide) echo ro.vendor.build.date=`$(DATE_FROM_FILE)`>>$@
$(hide) echo ro.vendor.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@
- $(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
+# Darth9 $(hide) echo ro.vendor.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@
endif
# ----------------------------------------------------------------
@@ -543,6 +546,8 @@ INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img
ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
INTERNAL_BOOTIMAGE_ARGS += --dt $(INSTALLED_DTIMAGE_TARGET)
BOOTIMAGE_EXTRA_DEPS := $(INSTALLED_DTIMAGE_TARGET)
+else
+ INSTALLED_DTIMAGE_TARGET :=
endif
INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
@@ -1014,6 +1019,29 @@ define build-recoveryramdisk
@echo Copying baseline ramdisk...
$(hide) rsync -a --exclude=etc --exclude=sdcard --exclude=vendor $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.
@echo Modifying ramdisk contents...
+
+# Darth9
+# OrangeFox (FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)
+ $(if $(filter 1,$(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)), \
+ $(hide) $(FOX_VENDOR) \
+ FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS="$(BOARD_MKBOOTIMG_ARGS)" \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)" \
+ recovery_uncompressed_ramdisk="$(recovery_uncompressed_ramdisk)")
+# Darth9
+
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
$(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
$(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
@@ -1147,6 +1175,22 @@ endif
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9
+# OrangeFox (FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)
+ifneq ($(NOT_ORANGEFOX),1)
+ ifeq ($(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)"
+ else
+ $(BASH) $(FOX_VENDOR)
+ endif
+endif
+# Darth9
+
ifeq ($(BOARD_NAND_PAGE_SIZE),)
BOARD_NAND_PAGE_SIZE := 2048
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -620,6 +620,20 @@ else
MD5SUM:=md5sum
endif
+# Darth9
+# OrangeFox post script
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+ FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER :=
+else
+ FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ export FOX_VENDOR=vendor/recovery/OrangeFox.sh
+ export BASH=bash
+ export FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER=1
+endif
+# Darth9
+
# In-place sed is done different in linux than OS X
ifeq ($(HOST_OS),darwin)
GSED:=$(shell which gsed)
diff --git a/core/main.mk b/core/main.mk
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,11 +393,13 @@ enable_target_debugging := true
tags_to_install :=
ifneq (,$(user_variant))
# Target is secure in user builds.
- ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
+# Darth9 - change 1 to 0 on the next line
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),user)
- ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
+# Darth9 - change 1 to 0 on the next line
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=0
endif
ifeq ($(user_variant),userdebug)
sync/patches/patch-manifest-fox_9.0.diff
+96
View File
@@ -0,0 +1,96 @@
diff --git a/core/Makefile b/core/Makefile
--- a/core/Makefile
+++ b/core/Makefile
@@ -1415,6 +1415,29 @@ define build-recoveryramdisk
# Copy adbd from system/bin to recovery/root/sbin
$(hide) cp -f $(TARGET_OUT_EXECUTABLES)/adbd $(TARGET_RECOVERY_ROOT_OUT)/sbin/adbd
# Modifying ramdisk contents...
+
+ # Darth9 #
+ $(if $(filter 1,$(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER)), \
+ $(hide) $(FOX_VENDOR) \
+ FOX_VENDOR_CMD="Fox_Before_Recovery_Image" \
+ FOX_MANIFEST_VER="9.0" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)" \
+ INTERNAL_RECOVERYIMAGE_ARGS='"$(INTERNAL_RECOVERYIMAGE_ARGS)"' \
+ INTERNAL_MKBOOTIMG_VERSION_ARGS="$(INTERNAL_MKBOOTIMG_VERSION_ARGS)" \
+ BOARD_MKBOOTIMG_ARGS="$(BOARD_MKBOOTIMG_ARGS)" \
+ TARGET_OUT="$(TARGET_OUT)" \
+ RECOVERY_RAMDISK_COMPRESSOR="$(RECOVERY_RAMDISK_COMPRESSOR)" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ BOARD_BOOTIMAGE_PARTITION_SIZE=$(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE) \
+ INTERNAL_KERNEL_CMDLINE="$(INTERNAL_KERNEL_CMDLINE)" \
+ recovery_ramdisk="$(recovery_ramdisk)" \
+ recovery_uncompressed_ramdisk="$(recovery_uncompressed_ramdisk)")
+ # Darth9 #
+
$(if $(BOARD_RECOVERY_KERNEL_MODULES), \
$(call build-image-kernel-modules,$(BOARD_RECOVERY_KERNEL_MODULES),$(TARGET_RECOVERY_ROOT_OUT),,$(call intermediates-dir-for,PACKAGING,depmod_recovery)))
# Removes $(TARGET_RECOVERY_ROOT_OUT)/init*.rc EXCEPT init.recovery*.rc.
@@ -1550,6 +1573,22 @@ endif
.PHONY: recoveryimage
recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)
+# Darth9 # FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER
+ifneq ($(NOT_ORANGEFOX),1)
+ ifeq ($(FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER),1)
+ $(BASH) $(FOX_VENDOR) FOX_VENDOR_CMD="Fox_After_Recovery_Image" \
+ FOX_MANIFEST_VER="9.0" \
+ INSTALLED_RECOVERYIMAGE_TARGET="$(INSTALLED_RECOVERYIMAGE_TARGET)" \
+ TARGET_ARCH="$(TARGET_ARCH)" \
+ TARGET_RECOVERY_ROOT_OUT="$(TARGET_RECOVERY_ROOT_OUT)" \
+ MKBOOTIMG="$(MKBOOTIMG)" \
+ MKBOOTFS="$(MKBOOTFS)"
+ else
+ $(BASH) $(FOX_VENDOR)
+ endif
+endif
+# Darth9
+
ifneq ($(BOARD_NAND_PAGE_SIZE),)
$(error MTD device is no longer supported and thus BOARD_NAND_PAGE_SIZE is deprecated.)
endif
diff --git a/core/config.mk b/core/config.mk
--- a/core/config.mk
+++ b/core/config.mk
@@ -755,6 +755,19 @@ else
MD5SUM:=md5sum
endif
+# Darth9
+# OrangeFox post script
+FOX_CURRENT_DEV_STR := $(shell git -C bootable/recovery log -1 --format='%ad (%h)' --date=short)
+ifdef NOT_ORANGEFOX
+ FOX_VENDOR :=
+ BASH :=
+else
+ FOX_VENDOR := vendor/recovery/OrangeFox.sh
+ BASH := bash
+ FOX_USE_TWRP_RECOVERY_IMAGE_BUILDER := 1
+endif
+# Darth9
+
APICHECK_CLASSPATH_ENTRIES := \
$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) \
$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \
diff --git a/core/main.mk b/core/main.mk
--- a/core/main.mk
+++ b/core/main.mk
@@ -272,11 +272,11 @@ enable_target_debugging := true
tags_to_install :=
ifneq (,$(user_variant))
# Target is secure in user builds.
- ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),user)
- ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=0
endif
ifeq ($(user_variant),userdebug)
sync/patches/usage.txt
+17
View File
@@ -0,0 +1,17 @@
**NOTES**:
The patches in this directory are for my own personal use, and are *unsupported*.
No questions will be answered about them. Use entirely at your own risk.
Using these patch files to patch a twrp minimal manifest for building OrangeFox:
1. Sync the relevant twrp minimal manifest, with the correct branch
2. Change to the manifest's "build" subdirectory
3. Run the command: patch -p1 < patch-manifest-fox_"X".diff ("X" = the branch version: eg, 9.0, 7.1, 6.0, etc)
4. Change to the manifest's "bootable" subdirectory
5. Remove the "recovery" subdirectory, and clone the OrangeFox sources into a new "recovery" subdirectory
6. Change to the manifest's "vendor" subdirectory
7. Clone the OrangeFox vendor tree into a new "recovery" subdirectory
** It would be much easier to just run the orangefox_sync.sh script in the parent directory.