commit
0b3069e7d0
13 changed files with 256 additions and 0 deletions
@ -0,0 +1,19 @@
@@ -0,0 +1,19 @@
|
||||
#!/bin/bash |
||||
|
||||
# Original script credit to ChronoMonochrome |
||||
# Adapted by JoshuaDoes to be simpler |
||||
|
||||
apply() { |
||||
[ ! -n "$ANDROID_BUILD_TOP" ] && echo "Please specify ANDROID_BUILD_TOP before running this script!" && return |
||||
|
||||
while read line; do |
||||
proj=$(echo $line | cut -d " " -f1) |
||||
patch=$(echo $line | cut -f 2- -d " ") |
||||
echo -e "Applying patches to $proj" |
||||
echo |
||||
git -C "$ANDROID_BUILD_TOP/$proj" apply "$ANDROID_BUILD_TOP/.repo/local_manifests/patches/$patch" |
||||
echo ""; echo ""; |
||||
done < $ANDROID_BUILD_TOP/.repo/local_manifests/patches/list.txt |
||||
} |
||||
|
||||
apply |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_noblelte" path="device/samsung/noblelte" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_nobleltetmo" path="device/samsung/nobleltetmo" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_nobleltezt" path="device/samsung/nobleltezt" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,33 @@
@@ -0,0 +1,33 @@
|
||||
From 31dedaf8a568d63db3abd79b2f94b5fb145661a1 Mon Sep 17 00:00:00 2001 |
||||
From: Exhigh <exhigh01@gmail.com> |
||||
Date: Sun, 16 Aug 2020 16:41:13 +0400 |
||||
Subject: [PATCH] Keyguard: Fix wattage calculation on devices that report directly in Ampere |
||||
|
||||
Idea for the solution taken from commit: |
||||
|
||||
base: Lockscreen Charging info (3/3) by: xyyx <xyyx@mail.ru> |
||||
|
||||
Signed-off-by: Exhigh <exhigh@gmail.com> |
||||
---
|
||||
.../src/com/android/keyguard/KeyguardUpdateMonitor.java | 4 +++- |
||||
1 file changed, 3 insertions(+), 1 deletion(-) |
||||
|
||||
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
|
||||
index e6204461f11..d21f8cbc254 100644
|
||||
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
|
||||
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
|
||||
@@ -1095,7 +1095,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
|
||||
if (maxChargingMicroAmp > 0) { |
||||
// Calculating muW = muA * muV / (10^6 mu^2 / mu); splitting up the divisor |
||||
// to maintain precision equally on both factors. |
||||
- maxChargingMicroWatt = (maxChargingMicroAmp / 1000)
|
||||
+ maxChargingMicroWatt = (maxChargingMicroAmp < 5 ?
|
||||
+ (maxChargingMicroAmp * 1000) : (maxChargingMicroAmp < 4000 ?
|
||||
+ maxChargingMicroAmp : (maxChargingMicroAmp / 1000)))
|
||||
* (maxChargingMicroVolt / 1000); |
||||
} else { |
||||
maxChargingMicroWatt = -1; |
||||
--
|
||||
2.17.1 |
||||
|
||||
|
@ -0,0 +1,2 @@
@@ -0,0 +1,2 @@
|
||||
build/soong soong_make_development_phases_easier.patch |
||||
frameworks/base keyguard_fix_wattage_calc_for_ampere.patch |
@ -0,0 +1,49 @@
@@ -0,0 +1,49 @@
|
||||
From 14a3cc51193e4b02616d25c92aeaa9359814e26d Mon Sep 17 00:00:00 2001 |
||||
From: JoshuaDoes <joshuadoespersonalstuff@gmail.com> |
||||
Date: Mon, 17 Aug 2020 06:03:30 -0700 |
||||
Subject: [PATCH] soong: Make development phases easier |
||||
|
||||
cc: Allow warnings for hardware and kernel paths |
||||
ui: Enable usage of some tools needed for custom build tasks |
||||
Change-Id: Ia81c03361efdfc9bf8eedd5c409074e81d18a8b4 |
||||
---
|
||||
cc/config/global.go | 2 ++ |
||||
ui/build/paths/config.go | 9 +++++++++ |
||||
2 files changed, 11 insertions(+) |
||||
|
||||
diff --git a/cc/config/global.go b/cc/config/global.go
|
||||
index 7c7b47a..e3f3739 100644
|
||||
--- a/cc/config/global.go
|
||||
+++ b/cc/config/global.go
|
||||
@@ -128,6 +128,8 @@ var (
|
||||
// Directories with warnings from Android.bp files. |
||||
WarningAllowedProjects = []string{ |
||||
"device/", |
||||
+ "hardware/",
|
||||
+ "kernel/",
|
||||
"vendor/", |
||||
} |
||||
|
||||
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
|
||||
index d17b9f7..7e95698 100644
|
||||
--- a/ui/build/paths/config.go
|
||||
+++ b/ui/build/paths/config.go
|
||||
@@ -176,6 +176,15 @@ var Configuration = map[string]PathConfig{
|
||||
"which": LinuxOnlyPrebuilt, |
||||
"xargs": LinuxOnlyPrebuilt, |
||||
"xxd": LinuxOnlyPrebuilt, |
||||
+
|
||||
+ // Extra stuff needed for now
|
||||
+ "aarch64-linux-android-ar": Allowed,
|
||||
+ "aarch64-linux-android-gcc": Allowed,
|
||||
+ "aarch64-linux-android-ld": Allowed,
|
||||
+ "aarch64-linux-android-nm": Allowed,
|
||||
+ "aarch64-linux-android-objcopy": Allowed,
|
||||
+ "aarch64-linux-android-objdump": Allowed,
|
||||
+ "aarch64-linux-android-readelf": Allowed,
|
||||
} |
||||
|
||||
func init() { |
||||
--
|
||||
2.25.4 |
||||
|
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zenlte" path="device/samsung/zenlte" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zenltetmo" path="device/samsung/zenltetmo" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zerofltecan" path="device/samsung/zerofltecan" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zerofltexx" path="device/samsung/zerofltexx" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zeroltecan" path="device/samsung/zeroltecan" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
@ -0,0 +1,17 @@
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<manifest> |
||||
<remove-project name="LineageOS/android_build_soong" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos" path="hardware/samsung_slsi/exynos" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_exynos5" path="hardware/samsung_slsi/exynos5" remote="github" revision="lineage-17.1" /> |
||||
<project name="LineageOS/android_hardware_samsung_slsi_openmax" path="hardware/samsung_slsi/openmax" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_build_soong" path="build/soong" groups="pdk,tradefed" > |
||||
<linkfile src="root.bp" dest="Android.bp" /> |
||||
<linkfile src="bootstrap.bash" dest="bootstrap.bash" /> |
||||
</project> |
||||
<project name="universal7420/android_device_samsung_universal7420-common" path="device/samsung/universal7420-common" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_device_samsung_zeroltexx" path="device/samsung/zeroltexx" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_hardware_samsung_slsi_exynos7420" path="hardware/samsung_slsi/exynos7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/android_kernel_samsung_universal7420" path="kernel/samsung/universal7420" remote="github" revision="lineage-17.1" /> |
||||
<project name="universal7420/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-17.1" /> |
||||
</manifest> |
Loading…
Reference in new issue