forked from ahnet-69/treble_voltage
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tidy up patches, add BT patch and hopefully fix debugging patch
- Loading branch information
1 parent
19b883e
commit f491851
Showing
6 changed files
with
4,371 additions
and
29 deletions.
There are no files selected for viewing
27 changes: 0 additions & 27 deletions
27
patches/personal/platform_build/0001-Enable-insecure-adb-for-debugging.patch
This file was deleted.
Oops, something went wrong.
29 changes: 29 additions & 0 deletions
29
patches/personal/platform_build/0001-build-Always-use-release-keys.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From 51a197e9e2f963962e40375f75e333b912388d44 Mon Sep 17 00:00:00 2001 | ||
From: Pranav Vashi <[email protected]> | ||
Date: Sat, 16 Oct 2021 00:12:03 +0530 | ||
Subject: [PATCH 3/4] build: Always use release-keys | ||
|
||
Change-Id: Iff4d88d6bd4c7f4f6b9270dea24a2673c8535d9e | ||
--- | ||
core/sysprop.mk | 6 +----- | ||
1 file changed, 1 insertion(+), 5 deletions(-) | ||
|
||
diff --git a/core/sysprop.mk b/core/sysprop.mk | ||
index 1b2ee8f862..96c54e0de6 100644 | ||
--- a/core/sysprop.mk | ||
+++ b/core/sysprop.mk | ||
@@ -177,11 +177,7 @@ endif | ||
# non-default dev keys (usually private keys from a vendor directory). | ||
# Both of these tags will be removed and replaced with "release-keys" | ||
# when the target-files is signed in a post-build step. | ||
-ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey) | ||
-BUILD_KEYS := test-keys | ||
-else | ||
-BUILD_KEYS := dev-keys | ||
-endif | ||
+BUILD_KEYS := release-keys | ||
BUILD_VERSION_TAGS += $(BUILD_KEYS) | ||
BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) | ||
|
||
-- | ||
2.34.1 |
2 changes: 1 addition & 1 deletion
2
patches/personal/platform_build/0002-Product-Exclude-AOSP-apn-list-on-custom-builds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From d86efb2b57d61cc219a9e7ccd2482cf00abd813a Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Tue, 26 Dec 2023 17:01:46 +0000 | ||
Subject: [PATCH 2/3] product: Exclude AOSP apn list on custom builds | ||
Subject: [PATCH 2/4] product: Exclude AOSP apn list on custom builds | ||
|
||
Change-Id: I76c8d5ef67de73d4558d350a87a9bc317aaad792 | ||
--- | ||
|
2 changes: 1 addition & 1 deletion
2
patches/personal/platform_build/0003-set-ccache-directory-to-build-dir.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 5b213010c65c8fed617206f0af935df63ea5eec1 Mon Sep 17 00:00:00 2001 | ||
From: "Christopher A. Williamson" <[email protected]> | ||
Date: Sat, 27 Jan 2024 23:00:01 +0000 | ||
Subject: [PATCH 3/3] set ccache directory to build dir | ||
Subject: [PATCH 4/4] set ccache directory to build dir | ||
|
||
--- | ||
envsetup.sh | 2 +- | ||
|
88 changes: 88 additions & 0 deletions
88
patches/personal/platform_build/0004-Temporary-allow-adbd-debugging.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
From 2fc6fc6461aa3e6c8d261dadd5a98fdd5e683ec4 Mon Sep 17 00:00:00 2001 | ||
From: "Christopher A. Williamson" <[email protected]> | ||
Date: Sun, 5 May 2024 19:36:19 +0100 | ||
Subject: [PATCH] Temporary allow adbd debugging | ||
|
||
--- | ||
...01-Enable-insecure-adb-for-debugging.patch | 28 ++++++++++++++++++ | ||
core/main.mk | 29 ++++--------------- | ||
2 files changed, 33 insertions(+), 24 deletions(-) | ||
create mode 100644 core/0001-Enable-insecure-adb-for-debugging.patch | ||
|
||
diff --git a/core/0001-Enable-insecure-adb-for-debugging.patch b/core/0001-Enable-insecure-adb-for-debugging.patch | ||
new file mode 100644 | ||
index 0000000..2050c24 | ||
--- /dev/null | ||
+++ b/core/0001-Enable-insecure-adb-for-debugging.patch | ||
@@ -0,0 +1,28 @@ | ||
+From 5bf36e62fe43fe344191936a07417537ce11cb3d Mon Sep 17 00:00:00 2001 | ||
+From: "Christopher A. Williamson" <[email protected]> | ||
+Date: Sun, 28 Apr 2024 22:01:09 +0100 | ||
+Subject: [PATCH] Enable insecure adb for debugging | ||
+ | ||
+--- | ||
+ core/main.mk | 5 ++--- | ||
+ 1 file changed, 2 insertions(+), 3 deletions(-) | ||
+ | ||
+diff --git a/core/main.mk b/core/main.mk | ||
+index 090fe9a..e8ee273 100644 | ||
+--- a/core/main.mk | ||
++++ b/core/main.mk | ||
+@@ -394,9 +394,8 @@ ifneq (,$(user_variant)) | ||
+ # Target is secure in user builds. | ||
+ ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1 | ||
+ | ||
+- ifeq ($(user_variant),user) | ||
+- ADDITIONAL_SYSTEM_PROPERTIES += ro.adb.secure=1 | ||
+- endif | ||
++ # Enable unauthenticated adb for debugging. | ||
++ ADDITIONAL_SYSTEM_PROPERTIES += ro.adb.secure=0 | ||
+ | ||
+ # Disable debugging in plain user builds. | ||
+ enable_target_debugging := | ||
+-- | ||
+2.44.0 | ||
+ | ||
diff --git a/core/main.mk b/core/main.mk | ||
index 090fe9a..ed94da8 100644 | ||
--- a/core/main.mk | ||
+++ b/core/main.mk | ||
@@ -390,31 +390,12 @@ user_variant := | ||
endif | ||
enable_target_debugging := false | ||
tags_to_install := | ||
-ifneq (,$(user_variant)) | ||
- # Target is secure in user builds. | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=1 | ||
|
||
- ifeq ($(user_variant),user) | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.adb.secure=1 | ||
- endif | ||
- | ||
- # Disable debugging in plain user builds. | ||
- enable_target_debugging := | ||
- | ||
- # Disallow mock locations by default for user builds | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=0 | ||
- | ||
-else # !user_variant | ||
- # Turn on checkjni for non-user builds. | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.kernel.android.checkjni=0 | ||
- # Set device insecure for non-user builds. | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=0 | ||
- # Allow mock locations by default for non user builds | ||
- ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=1 | ||
-endif # !user_variant | ||
- | ||
-# Target is less debuggable and adbd is off by default | ||
-ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=0 | ||
+# Temporary patch to force enable adbd | ||
+ADDITIONAL_SYSTEM_PROPERTIES += ro.secure=0 | ||
+ADDITIONAL_SYSTEM_PROPERTIES += ro.adb.secure=0 | ||
+ADDITIONAL_SYSTEM_PROPERTIES += ro.allow.mock.location=1 | ||
+ADDITIONAL_SYSTEM_PROPERTIES += ro.debuggable=1 | ||
|
||
## eng ## | ||
|
||
-- | ||
2.44.0 |
Oops, something went wrong.