Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-11 17:04:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Churn

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-11-28 22:44:47 -05:00
parent a53317a6c8
commit 7dd773c83b
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
10 changed files with 1152 additions and 1118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2145
Logs/resetWorkspace-LineageOS-21.0.txt
View File

File diff suppressed because it is too large Load Diff

1
Manifests/Manifest_LAOS-21.0.xml
View File

@ -50,6 +50,7 @@
<!-- START OF ADDITIONAL REPOS --> <!-- START OF ADDITIONAL REPOS -->
<!-- GrapheneOS --> <!-- GrapheneOS -->
<project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="3f07acfab1cfff00baf33c477f96d3e3f874275a" /> <project path="external/hardened_malloc" name="GrapheneOS/hardened_malloc" remote="github" revision="3f07acfab1cfff00baf33c477f96d3e3f874275a" />
<project path="packages/apps/CarrierConfig2" name="GrapheneOS/platform_packages_apps_CarrierConfig2" remote="github" revision="e710a67ed64620fc11f62520cceef4bba64dc2a6" />
<!-- END OF ADDITIONAL REPOS --> <!-- END OF ADDITIONAL REPOS -->
<!-- START OF DEVICE REPOS --> <!-- START OF DEVICE REPOS -->

76
Patches/LineageOS-21.0/android_art/0001-constify_JNINativeMethod.patch
View File

@ -83,7 +83,7 @@ index dffbf3b11d..e70366cc48 100644
{ "emptyJniStaticMethod0_Critical", "()V", { "emptyJniStaticMethod0_Critical", "()V",
reinterpret_cast<void*>(NAME_CRITICAL_JNI_METHOD(emptyJniStaticMethod0_1Critical)) }, reinterpret_cast<void*>(NAME_CRITICAL_JNI_METHOD(emptyJniStaticMethod0_1Critical)) },
diff --git a/runtime/native/dalvik_system_BaseDexClassLoader.cc b/runtime/native/dalvik_system_BaseDexClassLoader.cc diff --git a/runtime/native/dalvik_system_BaseDexClassLoader.cc b/runtime/native/dalvik_system_BaseDexClassLoader.cc
index a4f702c28d..01ea613b1c 100644 index f9a1aba022..dc738582d1 100644
--- a/runtime/native/dalvik_system_BaseDexClassLoader.cc --- a/runtime/native/dalvik_system_BaseDexClassLoader.cc
+++ b/runtime/native/dalvik_system_BaseDexClassLoader.cc +++ b/runtime/native/dalvik_system_BaseDexClassLoader.cc
@@ -69,7 +69,7 @@ static jobjectArray BaseDexClassLoader_computeClassLoaderContextsNative(JNIEnv* @@ -69,7 +69,7 @@ static jobjectArray BaseDexClassLoader_computeClassLoaderContextsNative(JNIEnv*
@ -96,7 +96,7 @@ index a4f702c28d..01ea613b1c 100644
"()[Ljava/lang/String;"), "()[Ljava/lang/String;"),
}; };
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index f602f73630..8539ed8082 100644 index f7f446542c..ca2b3e180b 100644
--- a/runtime/native/dalvik_system_DexFile.cc --- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc
@@ -994,7 +994,7 @@ static void DexFile_setTrusted(JNIEnv* env, jclass, jobject j_cookie) { @@ -994,7 +994,7 @@ static void DexFile_setTrusted(JNIEnv* env, jclass, jobject j_cookie) {
@ -109,7 +109,7 @@ index f602f73630..8539ed8082 100644
NATIVE_METHOD(DexFile, NATIVE_METHOD(DexFile,
defineClassNative, defineClassNative,
diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc
index cf2b25d6a2..d6fdb84873 100644 index 137b04fede..4e39c1f474 100644
--- a/runtime/native/dalvik_system_VMDebug.cc --- a/runtime/native/dalvik_system_VMDebug.cc
+++ b/runtime/native/dalvik_system_VMDebug.cc +++ b/runtime/native/dalvik_system_VMDebug.cc
@@ -514,7 +514,7 @@ static void VMDebug_setAllocTrackerStackDepth(JNIEnv* env, jclass, jint stack_de @@ -514,7 +514,7 @@ static void VMDebug_setAllocTrackerStackDepth(JNIEnv* env, jclass, jint stack_de
@ -122,7 +122,7 @@ index cf2b25d6a2..d6fdb84873 100644
NATIVE_METHOD(VMDebug, countInstancesOfClasses, "([Ljava/lang/Class;Z)[J"), NATIVE_METHOD(VMDebug, countInstancesOfClasses, "([Ljava/lang/Class;Z)[J"),
NATIVE_METHOD(VMDebug, dumpHprofData, "(Ljava/lang/String;I)V"), NATIVE_METHOD(VMDebug, dumpHprofData, "(Ljava/lang/String;I)V"),
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index f1561a2530..a1de2b5936 100644 index 593b98dc80..d131853efc 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc --- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -536,7 +536,7 @@ static jobject VMRuntime_getBaseApkOptimizationInfo(JNIEnv* env, [[maybe_unused] @@ -536,7 +536,7 @@ static jobject VMRuntime_getBaseApkOptimizationInfo(JNIEnv* env, [[maybe_unused]
@ -135,10 +135,10 @@ index f1561a2530..a1de2b5936 100644
NATIVE_METHOD(VMRuntime, bootClassPath, "()Ljava/lang/String;"), NATIVE_METHOD(VMRuntime, bootClassPath, "()Ljava/lang/String;"),
NATIVE_METHOD(VMRuntime, clampGrowthLimit, "()V"), NATIVE_METHOD(VMRuntime, clampGrowthLimit, "()V"),
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc
index 71078c9ad2..457d3887df 100644 index 599bdb9e4b..9ad9ce5060 100644
--- a/runtime/native/dalvik_system_VMStack.cc --- a/runtime/native/dalvik_system_VMStack.cc
+++ b/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc
@@ -168,7 +168,7 @@ static jobjectArray VMStack_getAnnotatedThreadStackTrace(JNIEnv* env, jclass, jo @@ -163,7 +163,7 @@ static jobjectArray VMStack_getAnnotatedThreadStackTrace(JNIEnv* env, jclass, jo
return GetThreadStack(soa, javaThread, fn); return GetThreadStack(soa, javaThread, fn);
} }
@ -148,7 +148,7 @@ index 71078c9ad2..457d3887df 100644
FAST_NATIVE_METHOD(VMStack, getCallingClassLoader, "()Ljava/lang/ClassLoader;"), FAST_NATIVE_METHOD(VMStack, getCallingClassLoader, "()Ljava/lang/ClassLoader;"),
FAST_NATIVE_METHOD(VMStack, getClosestUserClassLoader, "()Ljava/lang/ClassLoader;"), FAST_NATIVE_METHOD(VMStack, getClosestUserClassLoader, "()Ljava/lang/ClassLoader;"),
diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc
index dd44e2ec4b..22e35360a3 100644 index 3af197866b..abf8e8a847 100644
--- a/runtime/native/dalvik_system_ZygoteHooks.cc --- a/runtime/native/dalvik_system_ZygoteHooks.cc
+++ b/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc
@@ -466,7 +466,7 @@ static jboolean ZygoteHooks_nativeZygoteLongSuspendOk([[maybe_unused]] JNIEnv* e @@ -466,7 +466,7 @@ static jboolean ZygoteHooks_nativeZygoteLongSuspendOk([[maybe_unused]] JNIEnv* e
@ -161,7 +161,7 @@ index dd44e2ec4b..22e35360a3 100644
NATIVE_METHOD(ZygoteHooks, nativePostZygoteFork, "()V"), NATIVE_METHOD(ZygoteHooks, nativePostZygoteFork, "()V"),
NATIVE_METHOD(ZygoteHooks, nativePostForkSystemServer, "(I)V"), NATIVE_METHOD(ZygoteHooks, nativePostForkSystemServer, "(I)V"),
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 2abc4935e0..2abe4545a6 100644 index 1dc74e0db2..b30c9c58b3 100644
--- a/runtime/native/java_lang_Class.cc --- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc
@@ -971,7 +971,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { @@ -971,7 +971,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) {
@ -174,7 +174,7 @@ index 2abc4935e0..2abe4545a6 100644
"(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;"), "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;"),
FAST_NATIVE_METHOD(Class, ensureExtDataPresent, "()Ldalvik/system/ClassExt;"), FAST_NATIVE_METHOD(Class, ensureExtDataPresent, "()Ldalvik/system/ClassExt;"),
diff --git a/runtime/native/java_lang_Object.cc b/runtime/native/java_lang_Object.cc diff --git a/runtime/native/java_lang_Object.cc b/runtime/native/java_lang_Object.cc
index 8fc10d1114..8740755199 100644 index 5649b2cc5b..d328827985 100644
--- a/runtime/native/java_lang_Object.cc --- a/runtime/native/java_lang_Object.cc
+++ b/runtime/native/java_lang_Object.cc +++ b/runtime/native/java_lang_Object.cc
@@ -54,7 +54,7 @@ static jint Object_identityHashCodeNative(JNIEnv* env, jclass, jobject javaObjec @@ -54,7 +54,7 @@ static jint Object_identityHashCodeNative(JNIEnv* env, jclass, jobject javaObjec
@ -187,7 +187,7 @@ index 8fc10d1114..8740755199 100644
FAST_NATIVE_METHOD(Object, notify, "()V"), FAST_NATIVE_METHOD(Object, notify, "()V"),
FAST_NATIVE_METHOD(Object, notifyAll, "()V"), FAST_NATIVE_METHOD(Object, notifyAll, "()V"),
diff --git a/runtime/native/java_lang_StackStreamFactory.cc b/runtime/native/java_lang_StackStreamFactory.cc diff --git a/runtime/native/java_lang_StackStreamFactory.cc b/runtime/native/java_lang_StackStreamFactory.cc
index f876c1014b..f62670350f 100644 index 24d903047d..f3b1363002 100644
--- a/runtime/native/java_lang_StackStreamFactory.cc --- a/runtime/native/java_lang_StackStreamFactory.cc
+++ b/runtime/native/java_lang_StackStreamFactory.cc +++ b/runtime/native/java_lang_StackStreamFactory.cc
@@ -41,7 +41,7 @@ static jint StackStreamFactory_nativeFetchStackFrameInfo(JNIEnv* env, jclass, @@ -41,7 +41,7 @@ static jint StackStreamFactory_nativeFetchStackFrameInfo(JNIEnv* env, jclass,
@ -200,7 +200,7 @@ index f876c1014b..f62670350f 100644
FAST_NATIVE_METHOD(StackStreamFactory, nativeFetchStackFrameInfo, "(JLjava/lang/Object;III[Ljava/lang/Object;)I"), FAST_NATIVE_METHOD(StackStreamFactory, nativeFetchStackFrameInfo, "(JLjava/lang/Object;III[Ljava/lang/Object;)I"),
}; };
diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc
index f70a188e79..e982c4e3c9 100644 index 1ba0028fd3..d7bf0013ab 100644
--- a/runtime/native/java_lang_String.cc --- a/runtime/native/java_lang_String.cc
+++ b/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc
@@ -133,7 +133,7 @@ static jstring String_doRepeat(JNIEnv* env, jobject java_this, jint count) { @@ -133,7 +133,7 @@ static jstring String_doRepeat(JNIEnv* env, jobject java_this, jint count) {
@ -213,7 +213,7 @@ index f70a188e79..e982c4e3c9 100644
FAST_NATIVE_METHOD(String, compareTo, "(Ljava/lang/String;)I"), FAST_NATIVE_METHOD(String, compareTo, "(Ljava/lang/String;)I"),
FAST_NATIVE_METHOD(String, concat, "(Ljava/lang/String;)Ljava/lang/String;"), FAST_NATIVE_METHOD(String, concat, "(Ljava/lang/String;)Ljava/lang/String;"),
diff --git a/runtime/native/java_lang_StringFactory.cc b/runtime/native/java_lang_StringFactory.cc diff --git a/runtime/native/java_lang_StringFactory.cc b/runtime/native/java_lang_StringFactory.cc
index 2fbebc0941..62f3fcd566 100644 index e6c03dbcf2..efd1b0cc87 100644
--- a/runtime/native/java_lang_StringFactory.cc --- a/runtime/native/java_lang_StringFactory.cc
+++ b/runtime/native/java_lang_StringFactory.cc +++ b/runtime/native/java_lang_StringFactory.cc
@@ -294,7 +294,7 @@ static jstring StringFactory_newStringFromUtf8Bytes(JNIEnv* env, jclass, jbyteAr @@ -294,7 +294,7 @@ static jstring StringFactory_newStringFromUtf8Bytes(JNIEnv* env, jclass, jbyteAr
@ -226,7 +226,7 @@ index 2fbebc0941..62f3fcd566 100644
FAST_NATIVE_METHOD(StringFactory, newStringFromChars, "(II[C)Ljava/lang/String;"), FAST_NATIVE_METHOD(StringFactory, newStringFromChars, "(II[C)Ljava/lang/String;"),
FAST_NATIVE_METHOD(StringFactory, newStringFromString, "(Ljava/lang/String;)Ljava/lang/String;"), FAST_NATIVE_METHOD(StringFactory, newStringFromString, "(Ljava/lang/String;)Ljava/lang/String;"),
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc
index 63cbd2c815..e7b3894aad 100644 index 203d98dc4c..4d50b194cb 100644
--- a/runtime/native/java_lang_System.cc --- a/runtime/native/java_lang_System.cc
+++ b/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc
@@ -239,7 +239,7 @@ static void System_arraycopyBooleanUnchecked(JNIEnv* env, @@ -239,7 +239,7 @@ static void System_arraycopyBooleanUnchecked(JNIEnv* env,
@ -239,10 +239,10 @@ index 63cbd2c815..e7b3894aad 100644
FAST_NATIVE_METHOD(System, arraycopyCharUnchecked, "([CI[CII)V"), FAST_NATIVE_METHOD(System, arraycopyCharUnchecked, "([CI[CII)V"),
FAST_NATIVE_METHOD(System, arraycopyByteUnchecked, "([BI[BII)V"), FAST_NATIVE_METHOD(System, arraycopyByteUnchecked, "([BI[BII)V"),
diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc
index 570c554782..f90db08a8d 100644 index 65e3009c0f..71379e6f61 100644
--- a/runtime/native/java_lang_Thread.cc --- a/runtime/native/java_lang_Thread.cc
+++ b/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc
@@ -195,7 +195,7 @@ static void Thread_yield(JNIEnv*, jobject) { @@ -189,7 +189,7 @@ static void Thread_yield(JNIEnv*, jobject) {
sched_yield(); sched_yield();
} }
@ -252,7 +252,7 @@ index 570c554782..f90db08a8d 100644
FAST_NATIVE_METHOD(Thread, interrupted, "()Z"), FAST_NATIVE_METHOD(Thread, interrupted, "()Z"),
FAST_NATIVE_METHOD(Thread, isInterrupted, "()Z"), FAST_NATIVE_METHOD(Thread, isInterrupted, "()Z"),
diff --git a/runtime/native/java_lang_Throwable.cc b/runtime/native/java_lang_Throwable.cc diff --git a/runtime/native/java_lang_Throwable.cc b/runtime/native/java_lang_Throwable.cc
index b89e287481..5cdd70c513 100644 index 091ad03bb2..6520429f4a 100644
--- a/runtime/native/java_lang_Throwable.cc --- a/runtime/native/java_lang_Throwable.cc
+++ b/runtime/native/java_lang_Throwable.cc +++ b/runtime/native/java_lang_Throwable.cc
@@ -38,7 +38,7 @@ static jobjectArray Throwable_nativeGetStackTrace(JNIEnv* env, jclass, jobject j @@ -38,7 +38,7 @@ static jobjectArray Throwable_nativeGetStackTrace(JNIEnv* env, jclass, jobject j
@ -265,7 +265,7 @@ index b89e287481..5cdd70c513 100644
FAST_NATIVE_METHOD(Throwable, nativeGetStackTrace, "(Ljava/lang/Object;)[Ljava/lang/StackTraceElement;"), FAST_NATIVE_METHOD(Throwable, nativeGetStackTrace, "(Ljava/lang/Object;)[Ljava/lang/StackTraceElement;"),
}; };
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index 4dad46fb8c..3208a65c8e 100644 index ba1fde00d3..5a04d16634 100644
--- a/runtime/native/java_lang_VMClassLoader.cc --- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -164,7 +164,7 @@ static jobjectArray VMClassLoader_getBootClassPathEntries(JNIEnv* env, jclass) { @@ -164,7 +164,7 @@ static jobjectArray VMClassLoader_getBootClassPathEntries(JNIEnv* env, jclass) {
@ -278,7 +278,7 @@ index 4dad46fb8c..3208a65c8e 100644
NATIVE_METHOD(VMClassLoader, getBootClassPathEntries, "()[Ljava/lang/String;"), NATIVE_METHOD(VMClassLoader, getBootClassPathEntries, "()[Ljava/lang/String;"),
}; };
diff --git a/runtime/native/java_lang_invoke_MethodHandle.cc b/runtime/native/java_lang_invoke_MethodHandle.cc diff --git a/runtime/native/java_lang_invoke_MethodHandle.cc b/runtime/native/java_lang_invoke_MethodHandle.cc
index 5309a28a09..ed2d5ae126 100644 index 819656fd05..80f2d04ef0 100644
--- a/runtime/native/java_lang_invoke_MethodHandle.cc --- a/runtime/native/java_lang_invoke_MethodHandle.cc
+++ b/runtime/native/java_lang_invoke_MethodHandle.cc +++ b/runtime/native/java_lang_invoke_MethodHandle.cc
@@ -37,7 +37,7 @@ static void MethodHandle_invokeExactWithFrame(JNIEnv* env, jobject thiz, jobject @@ -37,7 +37,7 @@ static void MethodHandle_invokeExactWithFrame(JNIEnv* env, jobject thiz, jobject
@ -291,7 +291,7 @@ index 5309a28a09..ed2d5ae126 100644
}; };
diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.cc b/runtime/native/java_lang_invoke_MethodHandleImpl.cc diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.cc b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
index 00ce01f11a..fc53b82d36 100644 index ccd3370ff7..87af32488e 100644
--- a/runtime/native/java_lang_invoke_MethodHandleImpl.cc --- a/runtime/native/java_lang_invoke_MethodHandleImpl.cc
+++ b/runtime/native/java_lang_invoke_MethodHandleImpl.cc +++ b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
@@ -63,7 +63,7 @@ static jobject MethodHandleImpl_getMemberInternal(JNIEnv* env, jobject thiz) { @@ -63,7 +63,7 @@ static jobject MethodHandleImpl_getMemberInternal(JNIEnv* env, jobject thiz) {
@ -304,7 +304,7 @@ index 00ce01f11a..fc53b82d36 100644
}; };
diff --git a/runtime/native/java_lang_ref_FinalizerReference.cc b/runtime/native/java_lang_ref_FinalizerReference.cc diff --git a/runtime/native/java_lang_ref_FinalizerReference.cc b/runtime/native/java_lang_ref_FinalizerReference.cc
index 535b243411..0a8dfb6c09 100644 index 52f6f734d9..5dfd542b33 100644
--- a/runtime/native/java_lang_ref_FinalizerReference.cc --- a/runtime/native/java_lang_ref_FinalizerReference.cc
+++ b/runtime/native/java_lang_ref_FinalizerReference.cc +++ b/runtime/native/java_lang_ref_FinalizerReference.cc
@@ -42,7 +42,7 @@ static jobject FinalizerReference_getReferent(JNIEnv* env, jobject javaThis) { @@ -42,7 +42,7 @@ static jobject FinalizerReference_getReferent(JNIEnv* env, jobject javaThis) {
@ -317,7 +317,7 @@ index 535b243411..0a8dfb6c09 100644
FAST_NATIVE_METHOD(FinalizerReference, getReferent, "()Ljava/lang/Object;"), FAST_NATIVE_METHOD(FinalizerReference, getReferent, "()Ljava/lang/Object;"),
}; };
diff --git a/runtime/native/java_lang_ref_Reference.cc b/runtime/native/java_lang_ref_Reference.cc diff --git a/runtime/native/java_lang_ref_Reference.cc b/runtime/native/java_lang_ref_Reference.cc
index bd7235e14f..c2ee0f4c22 100644 index 4c411c8db4..190fe2babe 100644
--- a/runtime/native/java_lang_ref_Reference.cc --- a/runtime/native/java_lang_ref_Reference.cc
+++ b/runtime/native/java_lang_ref_Reference.cc +++ b/runtime/native/java_lang_ref_Reference.cc
@@ -76,7 +76,7 @@ static void Reference_clearReferent(JNIEnv* env, jobject javaThis) { @@ -76,7 +76,7 @@ static void Reference_clearReferent(JNIEnv* env, jobject javaThis) {
@ -330,7 +330,7 @@ index bd7235e14f..c2ee0f4c22 100644
FAST_NATIVE_METHOD(Reference, clearReferent, "()V"), FAST_NATIVE_METHOD(Reference, clearReferent, "()V"),
FAST_NATIVE_METHOD(Reference, refersTo0, "(Ljava/lang/Object;)Z"), FAST_NATIVE_METHOD(Reference, refersTo0, "(Ljava/lang/Object;)Z"),
diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc
index ff94593cdf..e359e7d8a8 100644 index 9ac6e614b6..f832c134ec 100644
--- a/runtime/native/java_lang_reflect_Array.cc --- a/runtime/native/java_lang_reflect_Array.cc
+++ b/runtime/native/java_lang_reflect_Array.cc +++ b/runtime/native/java_lang_reflect_Array.cc
@@ -74,7 +74,7 @@ static jobject Array_createObjectArray(JNIEnv* env, jclass, jclass javaElementCl @@ -74,7 +74,7 @@ static jobject Array_createObjectArray(JNIEnv* env, jclass, jclass javaElementCl
@ -343,7 +343,7 @@ index ff94593cdf..e359e7d8a8 100644
FAST_NATIVE_METHOD(Array, createObjectArray, "(Ljava/lang/Class;I)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Array, createObjectArray, "(Ljava/lang/Class;I)Ljava/lang/Object;"),
}; };
diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc
index 98afddc260..5f8196a4e5 100644 index f9278ab0d6..adf4242914 100644
--- a/runtime/native/java_lang_reflect_Constructor.cc --- a/runtime/native/java_lang_reflect_Constructor.cc
+++ b/runtime/native/java_lang_reflect_Constructor.cc +++ b/runtime/native/java_lang_reflect_Constructor.cc
@@ -129,7 +129,7 @@ static jobject Constructor_newInstanceFromSerialization(JNIEnv* env, @@ -129,7 +129,7 @@ static jobject Constructor_newInstanceFromSerialization(JNIEnv* env,
@ -356,7 +356,7 @@ index 98afddc260..5f8196a4e5 100644
FAST_NATIVE_METHOD(Constructor, newInstance0, "([Ljava/lang/Object;)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Constructor, newInstance0, "([Ljava/lang/Object;)Ljava/lang/Object;"),
FAST_NATIVE_METHOD(Constructor, newInstanceFromSerialization, "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Constructor, newInstanceFromSerialization, "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Object;"),
diff --git a/runtime/native/java_lang_reflect_Executable.cc b/runtime/native/java_lang_reflect_Executable.cc diff --git a/runtime/native/java_lang_reflect_Executable.cc b/runtime/native/java_lang_reflect_Executable.cc
index 87c9f6c341..db54200ef0 100644 index 3f3b648ecf..1f7cecf9aa 100644
--- a/runtime/native/java_lang_reflect_Executable.cc --- a/runtime/native/java_lang_reflect_Executable.cc
+++ b/runtime/native/java_lang_reflect_Executable.cc +++ b/runtime/native/java_lang_reflect_Executable.cc
@@ -363,7 +363,7 @@ static jint Executable_getParameterCountInternal(JNIEnv* env, jobject javaMethod @@ -363,7 +363,7 @@ static jint Executable_getParameterCountInternal(JNIEnv* env, jobject javaMethod
@ -369,7 +369,7 @@ index 87c9f6c341..db54200ef0 100644
"(Ljava/lang/reflect/Method;)I"), "(Ljava/lang/reflect/Method;)I"),
FAST_NATIVE_METHOD(Executable, getAnnotationNative, FAST_NATIVE_METHOD(Executable, getAnnotationNative,
diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc
index f2603d4c48..e1b91c6de2 100644 index 622b514ea3..49cbaed6c4 100644
--- a/runtime/native/java_lang_reflect_Field.cc --- a/runtime/native/java_lang_reflect_Field.cc
+++ b/runtime/native/java_lang_reflect_Field.cc +++ b/runtime/native/java_lang_reflect_Field.cc
@@ -549,7 +549,7 @@ static jboolean Field_isAnnotationPresentNative(JNIEnv* env, @@ -549,7 +549,7 @@ static jboolean Field_isAnnotationPresentNative(JNIEnv* env,
@ -382,7 +382,7 @@ index f2603d4c48..e1b91c6de2 100644
FAST_NATIVE_METHOD(Field, getBoolean, "(Ljava/lang/Object;)Z"), FAST_NATIVE_METHOD(Field, getBoolean, "(Ljava/lang/Object;)Z"),
FAST_NATIVE_METHOD(Field, getByte, "(Ljava/lang/Object;)B"), FAST_NATIVE_METHOD(Field, getByte, "(Ljava/lang/Object;)B"),
diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc
index 5f02ad0fd9..e2440d3dc8 100644 index 8cbc070eee..9439e99635 100644
--- a/runtime/native/java_lang_reflect_Method.cc --- a/runtime/native/java_lang_reflect_Method.cc
+++ b/runtime/native/java_lang_reflect_Method.cc +++ b/runtime/native/java_lang_reflect_Method.cc
@@ -86,7 +86,7 @@ static jobject Method_invoke(JNIEnv* env, jobject javaMethod, jobject javaReceiv @@ -86,7 +86,7 @@ static jobject Method_invoke(JNIEnv* env, jobject javaMethod, jobject javaReceiv
@ -395,7 +395,7 @@ index 5f02ad0fd9..e2440d3dc8 100644
FAST_NATIVE_METHOD(Method, getExceptionTypes, "()[Ljava/lang/Class;"), FAST_NATIVE_METHOD(Method, getExceptionTypes, "()[Ljava/lang/Class;"),
FAST_NATIVE_METHOD(Method, invoke, "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Method, invoke, "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"),
diff --git a/runtime/native/java_lang_reflect_Parameter.cc b/runtime/native/java_lang_reflect_Parameter.cc diff --git a/runtime/native/java_lang_reflect_Parameter.cc b/runtime/native/java_lang_reflect_Parameter.cc
index 263a56796f..92bf9078a4 100644 index fe9e4e3cbf..716024d93b 100644
--- a/runtime/native/java_lang_reflect_Parameter.cc --- a/runtime/native/java_lang_reflect_Parameter.cc
+++ b/runtime/native/java_lang_reflect_Parameter.cc +++ b/runtime/native/java_lang_reflect_Parameter.cc
@@ -98,7 +98,7 @@ static jobject Parameter_getAnnotationNative(JNIEnv* env, @@ -98,7 +98,7 @@ static jobject Parameter_getAnnotationNative(JNIEnv* env,
@ -408,7 +408,7 @@ index 263a56796f..92bf9078a4 100644
Parameter, Parameter,
getAnnotationNative, getAnnotationNative,
diff --git a/runtime/native/java_lang_reflect_Proxy.cc b/runtime/native/java_lang_reflect_Proxy.cc diff --git a/runtime/native/java_lang_reflect_Proxy.cc b/runtime/native/java_lang_reflect_Proxy.cc
index f723ed223d..c2b533de5d 100644 index a89f8274f8..2ba1d8b6ac 100644
--- a/runtime/native/java_lang_reflect_Proxy.cc --- a/runtime/native/java_lang_reflect_Proxy.cc
+++ b/runtime/native/java_lang_reflect_Proxy.cc +++ b/runtime/native/java_lang_reflect_Proxy.cc
@@ -37,7 +37,7 @@ static jclass Proxy_generateProxy(JNIEnv* env, jclass, jstring name, jobjectArra @@ -37,7 +37,7 @@ static jclass Proxy_generateProxy(JNIEnv* env, jclass, jstring name, jobjectArra
@ -421,7 +421,7 @@ index f723ed223d..c2b533de5d 100644
}; };
diff --git a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc diff --git a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
index fa288edcb8..299ac5a61d 100644 index 3f4c609432..e9f3a89bb1 100644
--- a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc --- a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
+++ b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc +++ b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
@@ -30,7 +30,7 @@ static jboolean AtomicLong_VMSupportsCS8(JNIEnv*, jclass) { @@ -30,7 +30,7 @@ static jboolean AtomicLong_VMSupportsCS8(JNIEnv*, jclass) {
@ -434,10 +434,10 @@ index fa288edcb8..299ac5a61d 100644
}; };
diff --git a/runtime/native/jdk_internal_misc_Unsafe.cc b/runtime/native/jdk_internal_misc_Unsafe.cc diff --git a/runtime/native/jdk_internal_misc_Unsafe.cc b/runtime/native/jdk_internal_misc_Unsafe.cc
index 9b2021d176..c9de0a1862 100644 index ba64c818c6..e774b321da 100644
--- a/runtime/native/jdk_internal_misc_Unsafe.cc --- a/runtime/native/jdk_internal_misc_Unsafe.cc
+++ b/runtime/native/jdk_internal_misc_Unsafe.cc +++ b/runtime/native/jdk_internal_misc_Unsafe.cc
@@ -506,7 +506,7 @@ static void Unsafe_unpark(JNIEnv* env, jobject, jobject jthread) { @@ -507,7 +507,7 @@ static void Unsafe_unpark(JNIEnv* env, jobject, jobject jthread) {
} }
} }
@ -447,7 +447,7 @@ index 9b2021d176..c9de0a1862 100644
FAST_NATIVE_METHOD(Unsafe, compareAndSwapLong, "(Ljava/lang/Object;JJJ)Z"), FAST_NATIVE_METHOD(Unsafe, compareAndSwapLong, "(Ljava/lang/Object;JJJ)Z"),
FAST_NATIVE_METHOD( FAST_NATIVE_METHOD(
diff --git a/runtime/native/libcore_io_Memory.cc b/runtime/native/libcore_io_Memory.cc diff --git a/runtime/native/libcore_io_Memory.cc b/runtime/native/libcore_io_Memory.cc
index 5e38280259..8648ea3799 100644 index 66a16ed0ad..697c0500df 100644
--- a/runtime/native/libcore_io_Memory.cc --- a/runtime/native/libcore_io_Memory.cc
+++ b/runtime/native/libcore_io_Memory.cc +++ b/runtime/native/libcore_io_Memory.cc
@@ -181,7 +181,7 @@ static void Memory_peekShortArray(JNIEnv* env, @@ -181,7 +181,7 @@ static void Memory_peekShortArray(JNIEnv* env,
@ -460,7 +460,7 @@ index 5e38280259..8648ea3799 100644
FAST_NATIVE_METHOD(Memory, peekCharArray, "(J[CIIZ)V"), FAST_NATIVE_METHOD(Memory, peekCharArray, "(J[CIIZ)V"),
FAST_NATIVE_METHOD(Memory, peekDoubleArray, "(J[DIIZ)V"), FAST_NATIVE_METHOD(Memory, peekDoubleArray, "(J[DIIZ)V"),
diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc
index 46f8993a10..0c053dfb28 100644 index b497f1092d..d70e55760e 100644
--- a/runtime/native/libcore_util_CharsetUtils.cc --- a/runtime/native/libcore_util_CharsetUtils.cc
+++ b/runtime/native/libcore_util_CharsetUtils.cc +++ b/runtime/native/libcore_util_CharsetUtils.cc
@@ -137,7 +137,7 @@ static jbyteArray CharsetUtils_toUtf8Bytes(JNIEnv* env, jclass, jstring java_str @@ -137,7 +137,7 @@ static jbyteArray CharsetUtils_toUtf8Bytes(JNIEnv* env, jclass, jstring java_str
@ -473,7 +473,7 @@ index 46f8993a10..0c053dfb28 100644
FAST_NATIVE_METHOD(CharsetUtils, toAsciiBytes, "(Ljava/lang/String;II)[B"), FAST_NATIVE_METHOD(CharsetUtils, toAsciiBytes, "(Ljava/lang/String;II)[B"),
FAST_NATIVE_METHOD(CharsetUtils, toIsoLatin1Bytes, "(Ljava/lang/String;II)[B"), FAST_NATIVE_METHOD(CharsetUtils, toIsoLatin1Bytes, "(Ljava/lang/String;II)[B"),
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
index 419aed8578..ccbef4f3f4 100644 index b2e94f90cc..bfa2c394a6 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
@@ -38,7 +38,7 @@ static void DdmServer_nativeSendChunk(JNIEnv* env, jclass, jint type, @@ -38,7 +38,7 @@ static void DdmServer_nativeSendChunk(JNIEnv* env, jclass, jint type,
@ -486,10 +486,10 @@ index 419aed8578..ccbef4f3f4 100644
}; };
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
index 081ec2043a..a84d522e23 100644 index 6da4529289..cfce755b4a 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
@@ -211,7 +211,7 @@ static jbyteArray DdmVmInternal_getThreadStats(JNIEnv* env, jclass) { @@ -203,7 +203,7 @@ static jbyteArray DdmVmInternal_getThreadStats(JNIEnv* env, jclass) {
return result; return result;
} }
@ -499,10 +499,10 @@ index 081ec2043a..a84d522e23 100644
NATIVE_METHOD(DdmVmInternal, setThreadNotifyEnabled, "(Z)V"), NATIVE_METHOD(DdmVmInternal, setThreadNotifyEnabled, "(Z)V"),
NATIVE_METHOD(DdmVmInternal, getStackTraceById, "(I)[Ljava/lang/StackTraceElement;"), NATIVE_METHOD(DdmVmInternal, getStackTraceById, "(I)[Ljava/lang/StackTraceElement;"),
diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc
index f1e47ee100..d2f3a00897 100644 index 38fe72555c..c4b51fa84c 100644
--- a/runtime/native/sun_misc_Unsafe.cc --- a/runtime/native/sun_misc_Unsafe.cc
+++ b/runtime/native/sun_misc_Unsafe.cc +++ b/runtime/native/sun_misc_Unsafe.cc
@@ -546,7 +546,7 @@ static void Unsafe_unpark(JNIEnv* env, jobject, jobject jthread) { @@ -547,7 +547,7 @@ static void Unsafe_unpark(JNIEnv* env, jobject, jobject jthread) {
} }
} }

12
Patches/LineageOS-21.0/android_bionic/0001-HM-Runtime_Control-2.patch
View File

@ -11,10 +11,10 @@ Subject: [PATCH] support assigning ID to path of current executable
4 files changed, 31 insertions(+), 1 deletion(-) 4 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index c61810e34..804e586e2 100644 index 1180a513e..1135b805c 100644
--- a/libc/bionic/libc_init_dynamic.cpp --- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp +++ b/libc/bionic/libc_init_dynamic.cpp
@@ -72,6 +72,28 @@ extern "C" __attribute__((weak)) void __hwasan_library_unloaded(ElfW(Addr) base, @@ -78,6 +78,28 @@ extern "C" __attribute__((weak)) void __hwasan_library_unloaded(ElfW(Addr) base,
const ElfW(Phdr)* phdr, const ElfW(Phdr)* phdr,
ElfW(Half) phnum); ElfW(Half) phnum);
@ -43,7 +43,7 @@ index c61810e34..804e586e2 100644
// We need a helper function for __libc_preinit because compiling with LTO may // We need a helper function for __libc_preinit because compiling with LTO may
// inline functions requiring a stack protector check, but __stack_chk_guard is // inline functions requiring a stack protector check, but __stack_chk_guard is
// not initialized at the start of __libc_preinit. __libc_preinit_impl will run // not initialized at the start of __libc_preinit. __libc_preinit_impl will run
@@ -103,7 +125,10 @@ static void __libc_preinit_impl() { @@ -109,7 +131,10 @@ static void __libc_preinit_impl() {
#endif #endif
// Hooks for various libraries to let them know that we're starting up. // Hooks for various libraries to let them know that we're starting up.
@ -70,7 +70,7 @@ index 2830a493d..5ce8f9103 100644
#include <android/legacy_stdlib_inlines.h> #include <android/legacy_stdlib_inlines.h>
diff --git a/libc/libc.map.txt b/libc/libc.map.txt diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 156e9ee32..5d87cd8ef 100644 index 2c8ec0796..f5340c172 100644
--- a/libc/libc.map.txt --- a/libc/libc.map.txt
+++ b/libc/libc.map.txt +++ b/libc/libc.map.txt
@@ -420,6 +420,7 @@ LIBC { @@ -420,6 +420,7 @@ LIBC {
@ -82,10 +82,10 @@ index 156e9ee32..5d87cd8ef 100644
getauxval; # introduced-arm=18 introduced-arm64=21 introduced-x86=18 introduced-x86_64=21 getauxval; # introduced-arm=18 introduced-arm64=21 introduced-x86=18 introduced-x86_64=21
getc; getc;
diff --git a/libc/private/bionic_globals.h b/libc/private/bionic_globals.h diff --git a/libc/private/bionic_globals.h b/libc/private/bionic_globals.h
index 8ea7d4d66..66f8d84b0 100644 index 6f1e3895e..598918f09 100644
--- a/libc/private/bionic_globals.h --- a/libc/private/bionic_globals.h
+++ b/libc/private/bionic_globals.h +++ b/libc/private/bionic_globals.h
@@ -65,6 +65,7 @@ struct libc_globals { @@ -66,6 +66,7 @@ struct libc_globals {
// limit is enabled and some other hook is enabled at the same time. // limit is enabled and some other hook is enabled at the same time.
_Atomic(const MallocDispatch*) default_dispatch_table; _Atomic(const MallocDispatch*) default_dispatch_table;
MallocDispatch malloc_dispatch_table; MallocDispatch malloc_dispatch_table;

8
Patches/LineageOS-21.0/android_bionic/0001-HM-Use_HM.patch
View File

@ -16,10 +16,10 @@ Co-authored-by: anupritaisno1 <www.anuprita804@gmail.com>
create mode 100644 libc/bionic/h_malloc_wrapper.cpp create mode 100644 libc/bionic/h_malloc_wrapper.cpp
diff --git a/libc/Android.bp b/libc/Android.bp diff --git a/libc/Android.bp b/libc/Android.bp
index 71d8ee556..13cefe94f 100644 index 68155b1db..a5f87c3a2 100644
--- a/libc/Android.bp --- a/libc/Android.bp
+++ b/libc/Android.bp +++ b/libc/Android.bp
@@ -76,6 +76,8 @@ libc_common_flags = [ @@ -48,6 +48,8 @@ libc_common_flags = [
// ever touch 0, 1, or 2 bytes into a call to memset, which was never going // ever touch 0, 1, or 2 bytes into a call to memset, which was never going
// to amortize.) // to amortize.)
"-fno-builtin", "-fno-builtin",
@ -28,7 +28,7 @@ index 71d8ee556..13cefe94f 100644
] ]
// Define some common cflags // Define some common cflags
@@ -159,13 +161,30 @@ libc_scudo_product_variables = { @@ -131,13 +133,30 @@ libc_scudo_product_variables = {
// ======================================================== // ========================================================
cc_defaults { cc_defaults {
name: "libc_native_allocator_defaults", name: "libc_native_allocator_defaults",
@ -64,7 +64,7 @@ index 71d8ee556..13cefe94f 100644
} }
// Functions not implemented by jemalloc directly, or that need to // Functions not implemented by jemalloc directly, or that need to
@@ -173,12 +192,20 @@ cc_defaults { @@ -145,12 +164,20 @@ cc_defaults {
cc_library_static { cc_library_static {
name: "libc_jemalloc_wrapper", name: "libc_jemalloc_wrapper",
defaults: ["libc_defaults"], defaults: ["libc_defaults"],

4
Patches/LineageOS-21.0/android_bionic/0001-HM-Workaround-1.patch
View File

@ -10,10 +10,10 @@ Subject: [PATCH] disable hardened_malloc for Pixel camera provider service
3 files changed, 7 insertions(+) 3 files changed, 7 insertions(+)
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index 804e586e2..7097a70b0 100644 index 1135b805c..042d037a3 100644
--- a/libc/bionic/libc_init_dynamic.cpp --- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp +++ b/libc/bionic/libc_init_dynamic.cpp
@@ -84,6 +84,9 @@ static void init_prog_id(libc_globals* globals) { @@ -90,6 +90,9 @@ static void init_prog_id(libc_globals* globals) {
#define IS(prog) (!strcmp(exe_path, prog)) #define IS(prog) (!strcmp(exe_path, prog))

4
Patches/LineageOS-21.0/android_bionic/0001-HM-Workaround-2.patch
View File

@ -10,10 +10,10 @@ Subject: [PATCH] disable hardened_malloc for surfaceflinger
3 files changed, 5 insertions(+) 3 files changed, 5 insertions(+)
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index 7097a70b0..f83d24ea7 100644 index 042d037a3..9f17fd16a 100644
--- a/libc/bionic/libc_init_dynamic.cpp --- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp +++ b/libc/bionic/libc_init_dynamic.cpp
@@ -87,6 +87,9 @@ static void init_prog_id(libc_globals* globals) { @@ -93,6 +93,9 @@ static void init_prog_id(libc_globals* globals) {
if (IS("/apex/com.google.pixel.camera.hal/bin/hw/android.hardware.camera.provider@2.7-service-google")) { if (IS("/apex/com.google.pixel.camera.hal/bin/hw/android.hardware.camera.provider@2.7-service-google")) {
prog_id = PROG_PIXEL_CAMERA_PROVIDER_SERVICE; prog_id = PROG_PIXEL_CAMERA_PROVIDER_SERVICE;
} }

16
Patches/LineageOS-21.0/android_frameworks_base/0033-Ugly_Orbot_Workaround.patch
View File

@ -9,8 +9,8 @@ lockdownAllowlist can be either null or immutable, the latter case wasn't handle
Change-Id: I62c2553c8877b946d7e7e1ca4ef113f963d3f8eb Change-Id: I62c2553c8877b946d7e7e1ca4ef113f963d3f8eb
--- ---
.../com/android/server/connectivity/Vpn.java | 40 +++++++++++++++++++ .../com/android/server/connectivity/Vpn.java | 46 +++++++++++++++++++
1 file changed, 40 insertions(+) 1 file changed, 46 insertions(+)
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index c5170585a1b3..f430b7b7c7a1 100644 index c5170585a1b3..f430b7b7c7a1 100644
@ -44,12 +44,15 @@ index c5170585a1b3..f430b7b7c7a1 100644
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.net.Inet4Address; import java.net.Inet4Address;
@@ -979,6 +983,42 @@ public class Vpn { @@ -979,6 +983,48 @@ public class Vpn {
return false; return false;
} }
+ final String ORBOT_PACKAGE_NAME = "org.torproject.android"; + final String ORBOT_PACKAGE_NAME = "org.torproject.android";
+ if (ORBOT_PACKAGE_NAME.equals(packageName)) { + final String INVIZIBLE_PACKAGE_NAME = "pan.alexander.tordnscrypt.stable";
+ final String TOR_VPN_PACKAGE_NAME = "org.torproject.vpn";
+ final String TOR_SERVICES_PACKAGE_NAME = "org.torproject.services";
+ if (ORBOT_PACKAGE_NAME.equals(packageName) || TOR_VPN_PACKAGE_NAME.equals(packageName) || TOR_SERVICES_PACKAGE_NAME.equals(packageName)) {
+ if (lockdownAllowlist == null) { + if (lockdownAllowlist == null) {
+ lockdownAllowlist = new ArrayList<>(); + lockdownAllowlist = new ArrayList<>();
+ Log.i(TAG, "lockdown allowlist was null, created"); + Log.i(TAG, "lockdown allowlist was null, created");
@ -59,7 +62,10 @@ index c5170585a1b3..f430b7b7c7a1 100644
+ } + }
+ final Set<Pair<String, String>> ORBOT_LOCKDOWN_ALLOWLIST = Set.of( + final Set<Pair<String, String>> ORBOT_LOCKDOWN_ALLOWLIST = Set.of(
+ new Pair<>("org.torproject.torbrowser", "308205953082037DA003020102020900BA2DF613084D2BFD300D06092A864886F70D01010B0500305C3114301206035504030C0B546F722042726F7773657231183016060355040A0C0F54686520546F722050726F6A6563743110300E06035504070C0753656174746C65310B300906035504080C025741310B3009060355040613025553301E170D3139303531383231353834325A170D3334303531343231353834325A305C3114301206035504030C0B546F722042726F7773657231183016060355040A0C0F54686520546F722050726F6A6563743110300E06035504070C0753656174746C65310B300906035504080C025741310B300906035504061302555330820222300D06092A864886F70D01010105000382020F003082020A0282020100F3EE231D69CE435F324AD4AA398AEF3131876AE74563428B61F6AD8C65C522FDDF6EDCC24F6E615AD978598F8C595C632F2D51DF8225EC26742AF7479D8B45EEA379AC7C21E8665BDFB2AC8F0008C0B47A2BA89CAA39C581C0827D35599DA3D6E0FD4045DD4EBDEEDE39790BE6DD630B6BA7908BEB39E20EAA9C42DBCC5BB7B4F7A43F0E2F9DD91E076E2C7CDCC2F8F9B626628F366831EB917D2E54DEF859DF042084460AADCB1D53FF8114F8D666494992B260AF2B7F4CDD80B7733296B79E8831CBC8BA54B028CF3202DFDA84855540567C62AED813F32BAEE137CE3FC149A109B0A36E32FCB28A2A8D2E7C2F67D9B189FFD2E53FFF8EDDADE9D05D3E33560E73ECBF1F8C582077272AE7B5E9D16E0376A0AB39606B2089E78CBC4A37DA4D85F5965DB420CB6D77717348A21B49358F0C34742DA74B69F6746A2988EB815E2910A7F492F52E14DCC17414BE735594E6B6AD62BF0A701D3A3DD27457050101E568CF32536A4E7FD069908BACCF2197BB9C4C2585446DF2BDA23C4EDDA671CF1A881803959951071F8D03AC8DFF38AB00ABF88C87CD3783815032F9288169194EAD8EA0A28A518CD8EC0A0CD5C60800DE1683A0436B09A026524ABEDFF94E0D7AC6EF3E06F8865C780BC1818C64134389FF30D4331053EA2591D65808215C6878D1FB3E4FE7627B926FB9C1031A778F6FFE87BBFE35141B36F271B05075E75F0203010001A35A305830090603551D1304023000300B0603551D0F040403020780301D0603551D0E041604146D96FBE7BED0BD62CBB0C2607B6EDA93EDB69455301F0603551D230418301680146D96FBE7BED0BD62CBB0C2607B6EDA93EDB69455300D06092A864886F70D01010B0500038202010027C7E940533A854AEFCE955438A5344BD366CD2DD8C24E8DDC990D31D3AD5C5331EABCB2F01ED5517A19CC5AD5439DD8193F94D5474D76131762647DAE91EDB59EE90A84CEC2DFC61DDAEB12B88BCC58ED6736AA650AE0DB72372BC70E2651029D240D8993A18482B88881920FD50E023F7FFDE705B723CEB6F5E6AFA969A96B1C9531C9443694BFE504610E208C852E7C0B2CCD063E39DD5CCA83B3E901B1A3372DA55E4C854607D4C35673348A511B5929B825BF058F8BD3ABA2961C4C273AA124D24144D9A24961A6135B3BB8CDE2290A54271BECE02E0CBAF6ABD4AF13FF1D7C4A5192CF577A1DE47A51030308940F900BFBACACAB85F0D08B0606364415070CF851E630C8516656E8324B86DAACF482D571C1FD3865264E091D189D07171695E424E78FE91ABD25A993B6014C5A97647CC963C2A2602632299C471C8E29312592CDBC84E6DD275E8F008651192F197B969701A276DAF0672FCD3B5D734328D53B910F0931FA11A176EC00EAB73C813F30C33BF4E2E347F15BFD30701FBB0353410F991AE2C5B4492E51E0C439F517F4F34791D4CED1A362F3D1FB47AD3EDE2B41C1D038A2DD79B2AB344B2F1C7BEF3E339BA6DCED49461EF7DF58B18090FC1A50DFA3F6F058F561B2C909F61F0FBB351B79ABFFD7553D14B568284A863B5CD373F0F69C23DB81456F3F2F9DCEADDE55670E9D04D870E5A06BEC2BCAEE5D"), + new Pair<>("org.torproject.torbrowser", "308205953082037DA003020102020900BA2DF613084D2BFD300D06092A864886F70D01010B0500305C3114301206035504030C0B546F722042726F7773657231183016060355040A0C0F54686520546F722050726F6A6563743110300E06035504070C0753656174746C65310B300906035504080C025741310B3009060355040613025553301E170D3139303531383231353834325A170D3334303531343231353834325A305C3114301206035504030C0B546F722042726F7773657231183016060355040A0C0F54686520546F722050726F6A6563743110300E06035504070C0753656174746C65310B300906035504080C025741310B300906035504061302555330820222300D06092A864886F70D01010105000382020F003082020A0282020100F3EE231D69CE435F324AD4AA398AEF3131876AE74563428B61F6AD8C65C522FDDF6EDCC24F6E615AD978598F8C595C632F2D51DF8225EC26742AF7479D8B45EEA379AC7C21E8665BDFB2AC8F0008C0B47A2BA89CAA39C581C0827D35599DA3D6E0FD4045DD4EBDEEDE39790BE6DD630B6BA7908BEB39E20EAA9C42DBCC5BB7B4F7A43F0E2F9DD91E076E2C7CDCC2F8F9B626628F366831EB917D2E54DEF859DF042084460AADCB1D53FF8114F8D666494992B260AF2B7F4CDD80B7733296B79E8831CBC8BA54B028CF3202DFDA84855540567C62AED813F32BAEE137CE3FC149A109B0A36E32FCB28A2A8D2E7C2F67D9B189FFD2E53FFF8EDDADE9D05D3E33560E73ECBF1F8C582077272AE7B5E9D16E0376A0AB39606B2089E78CBC4A37DA4D85F5965DB420CB6D77717348A21B49358F0C34742DA74B69F6746A2988EB815E2910A7F492F52E14DCC17414BE735594E6B6AD62BF0A701D3A3DD27457050101E568CF32536A4E7FD069908BACCF2197BB9C4C2585446DF2BDA23C4EDDA671CF1A881803959951071F8D03AC8DFF38AB00ABF88C87CD3783815032F9288169194EAD8EA0A28A518CD8EC0A0CD5C60800DE1683A0436B09A026524ABEDFF94E0D7AC6EF3E06F8865C780BC1818C64134389FF30D4331053EA2591D65808215C6878D1FB3E4FE7627B926FB9C1031A778F6FFE87BBFE35141B36F271B05075E75F0203010001A35A305830090603551D1304023000300B0603551D0F040403020780301D0603551D0E041604146D96FBE7BED0BD62CBB0C2607B6EDA93EDB69455301F0603551D230418301680146D96FBE7BED0BD62CBB0C2607B6EDA93EDB69455300D06092A864886F70D01010B0500038202010027C7E940533A854AEFCE955438A5344BD366CD2DD8C24E8DDC990D31D3AD5C5331EABCB2F01ED5517A19CC5AD5439DD8193F94D5474D76131762647DAE91EDB59EE90A84CEC2DFC61DDAEB12B88BCC58ED6736AA650AE0DB72372BC70E2651029D240D8993A18482B88881920FD50E023F7FFDE705B723CEB6F5E6AFA969A96B1C9531C9443694BFE504610E208C852E7C0B2CCD063E39DD5CCA83B3E901B1A3372DA55E4C854607D4C35673348A511B5929B825BF058F8BD3ABA2961C4C273AA124D24144D9A24961A6135B3BB8CDE2290A54271BECE02E0CBAF6ABD4AF13FF1D7C4A5192CF577A1DE47A51030308940F900BFBACACAB85F0D08B0606364415070CF851E630C8516656E8324B86DAACF482D571C1FD3865264E091D189D07171695E424E78FE91ABD25A993B6014C5A97647CC963C2A2602632299C471C8E29312592CDBC84E6DD275E8F008651192F197B969701A276DAF0672FCD3B5D734328D53B910F0931FA11A176EC00EAB73C813F30C33BF4E2E347F15BFD30701FBB0353410F991AE2C5B4492E51E0C439F517F4F34791D4CED1A362F3D1FB47AD3EDE2B41C1D038A2DD79B2AB344B2F1C7BEF3E339BA6DCED49461EF7DF58B18090FC1A50DFA3F6F058F561B2C909F61F0FBB351B79ABFFD7553D14B568284A863B5CD373F0F69C23DB81456F3F2F9DCEADDE55670E9D04D870E5A06BEC2BCAEE5D"),
+ new Pair<>("org.briarproject.briar.android", "308202D5308201BDA00302010202040B7BA025300D06092A864886F70D01010B0500301B31193017060355040A1310627269617270726F6A6563742E6F7267301E170D3138303432353135323735365A170D3435303931303135323735365A301B31193017060355040A1310627269617270726F6A6563742E6F726730820122300D06092A864886F70D01010105000382010F003082010A0282010100887D49815638C3E01B08FA5CD80A62FE2640DAB155E848EBC0CF18ABD61618CE1B17632143D612D3AF282DC6B477E43286E5CD559E0DEB5AE951532A1347E95C2A9BC064FBE06E21528A0DDD3AB734679FEF9E31A49042694BF8C4E2DA66F820F6D2BF1F9D5180C409152F80FFD5EAB39B5423F8F09127A8B89D92B0F588284F783356B8812FC35893A526671573B8DDC3A85BAB46DC60DEA13351A2091728C037F20929DD668E757E905F98CC31D7B8B95E9E5D103A33320C71282CD0C797961C99B65CD33F478551FB28F51D5D2A3D636897AC87C1EB5D25323831526424014719136A7104BF8B60A6A30882C526056FB7D5372EA79371CAEAC7C92BC14B050203010001A321301F301D0603551D0E04160414E76D3580725F8DBD28912FF4DF18375F60B49211300D06092A864886F70D01010B050003820101002BAAA21FDF7301562EC3597705B4989B77114428619E84A8288032DB95251CFBB938DDE28BEACBFC63C6A52DE1520973EF19E8355534732139C374B320BEF56E8EF2CA2129307C589D99912317F57CA8639427B7B20225DAB64D12112B57510081A3E6B33EBEE96CAC80E13CDBC73C41BD1F4E0125B6376B95A71411223C15DD8AA1A5734029713097C27073EBCC325688991EF3A46D4CD03E48FD46749937F641C618B783AC7FF0D428E0443EBE36A3D23D82014EA95758344EBFA2A041253CEB7EE6B687857956EE69840E0DA71A6529D33F3674C78C3BAFFBD9724858EA82CB651B58D4D8A0607E763BD0F37D145C3EE705F7D41322AA1A00D5A36F1275EA") + new Pair<>("org.torproject.torbrowser_alpha", "3082048F308202F7A00302010202045F29A0F3300D06092A864886F70D01010B05003078310B3009060355040613025553310B30090603550408130257413110300E0603550407130753656174746C6531183016060355040A130F54686520546F722050726F6A656374311A3018060355040B13114170706C69636174696F6E73205465616D311430120603550403130B546F722042726F77736572301E170D3138303832323137313734375A170D3436303130373137313734375A3078310B3009060355040613025553310B30090603550408130257413110300E0603550407130753656174746C6531183016060355040A130F54686520546F722050726F6A656374311A3018060355040B13114170706C69636174696F6E73205465616D311430120603550403130B546F722042726F77736572308201A2300D06092A864886F70D01010105000382018F003082018A0282018100946FEFE55D8224F6EBCF8BE2ADCC7AE3CA6E5F667C6BBBD89B3AC1C16A940C8C4574E892FA36CAD84DFA7F33325A5CDA11C9D35751F3C4606AA954B1E1792EFB93E806B1239CCB3216996F0C34369F974BF73D65FC59FF46195942322792D411E1BDCF56C11B428A868C725FD69BD484241988913D18224DA5E591203E8B5D576150ED8A0A97F02FAE8E5E1452BDF2053F405F5BC9D650BC8112E0C08733F3FF68AE9C1AA149BFED5984831F4DF58B3CB9B5D49674F9126E24C306EB9D9B843BB38EC0ADD905278EB7D8851FF8B60127E5BBE709EC92C59DDF2A97D06D0A55CA3FCDEEF7B643D76D8D21A3A25DFD98287E0BB16499C99EAC93C37F7093BC999DA2ED0A962E83DF2AA0B3F312A8A65A08B50D8D1A2115339191C6CB215B5889F9DD36E0E5AEA43E9CD8CB7C58C85B1C7799DF1043054AADBD38A3312433B46876E64B1374EF69709C5092451E3AE6F840BDB8D0C0B44DDBCF00FEB0645028EDDA3F4DE29CA70098988CA3EA2822BBF90B51FB039D966D770DA63426B55D584CD70203010001A321301F301D0603551D0E04160414E61D340498A07A83422C112A8C9DD3D6E79E7366300D06092A864886F70D01010B05000382018100766459A7A2F8AAA65B1AA76DBAC97083B366ECBCCE2F91495281412FC264F9EA9084A14F45B66D2564311E1BAEF539CC3B517E981F82E1614709DCB7FF4619D465309984313726FF870D8198B33CD3B663CD0757712C2D33438C5B4C5FC0C1BE5B64D2864C4A5965A8685BEEDA99C027DE28148FCFE687E17827BE94EF91683FBB1D011BE7E4620B6CDDD61C42869667A9C4418A0FA49C89FB380FAC6B4621304752B0F6582AFA9AE6AB115211EC965FC23CB59271526E503F7200F3A11835DCBD779EDB0217DF251A1881668F141AF98D16E6D2A25C339B27FB512DF366FCA9B0AAD7257CF4AD4D696C50B4D4391AEB6E94564CD9A0C7F9DE6F4A8DC2293FDD94DE5D866615ECAB1249DBAB6EF31F7C2708B9976DAEA663AC36DB40798B54308D4E0DDC4BFEE5442157CEC38F25C984203AC76C2222838B73436E3B68CCC55938FBDC4B1D844ABABE19AA0A66391718083B6DE45D2D6BEC9861A87A3B9FB7E376CAA45868543BB23095425AB60FD18325456F9CF123DB9CEBC2D81198F80B66"),
+ new Pair<>("org.briarproject.briar.android", "308202D5308201BDA00302010202040B7BA025300D06092A864886F70D01010B0500301B31193017060355040A1310627269617270726F6A6563742E6F7267301E170D3138303432353135323735365A170D3435303931303135323735365A301B31193017060355040A1310627269617270726F6A6563742E6F726730820122300D06092A864886F70D01010105000382010F003082010A0282010100887D49815638C3E01B08FA5CD80A62FE2640DAB155E848EBC0CF18ABD61618CE1B17632143D612D3AF282DC6B477E43286E5CD559E0DEB5AE951532A1347E95C2A9BC064FBE06E21528A0DDD3AB734679FEF9E31A49042694BF8C4E2DA66F820F6D2BF1F9D5180C409152F80FFD5EAB39B5423F8F09127A8B89D92B0F588284F783356B8812FC35893A526671573B8DDC3A85BAB46DC60DEA13351A2091728C037F20929DD668E757E905F98CC31D7B8B95E9E5D103A33320C71282CD0C797961C99B65CD33F478551FB28F51D5D2A3D636897AC87C1EB5D25323831526424014719136A7104BF8B60A6A30882C526056FB7D5372EA79371CAEAC7C92BC14B050203010001A321301F301D0603551D0E04160414E76D3580725F8DBD28912FF4DF18375F60B49211300D06092A864886F70D01010B050003820101002BAAA21FDF7301562EC3597705B4989B77114428619E84A8288032DB95251CFBB938DDE28BEACBFC63C6A52DE1520973EF19E8355534732139C374B320BEF56E8EF2CA2129307C589D99912317F57CA8639427B7B20225DAB64D12112B57510081A3E6B33EBEE96CAC80E13CDBC73C41BD1F4E0125B6376B95A71411223C15DD8AA1A5734029713097C27073EBCC325688991EF3A46D4CD03E48FD46749937F641C618B783AC7FF0D428E0443EBE36A3D23D82014EA95758344EBFA2A041253CEB7EE6B687857956EE69840E0DA71A6529D33F3674C78C3BAFFBD9724858EA82CB651B58D4D8A0607E763BD0F37D145C3EE705F7D41322AA1A00D5A36F1275EA"),
+ new Pair<>("im.cwtch.flwtch", "3082032930820211A00302010202040C6C3467300D06092A864886F70D01010B05003045310B300906035504061302434131263024060355040A131D4F70656E205072697661637920526573656172636820536F6369657479310E300C060355040B13054377746368301E170D3230313231303030343134335A170D3435313230343030343134335A3045310B300906035504061302434131263024060355040A131D4F70656E205072697661637920526573656172636820536F6369657479310E300C060355040B1305437774636830820122300D06092A864886F70D01010105000382010F003082010A0282010100994642DF378316342AD81FCE41B8E8A3B4B14C1E02462D657D37F5B56CF063A87F054954654D09A1906A2E2173AB24D6AAD702FB16718A4B6022F1B37DDC0FE75DC1BFA4EB5927B4F1D93DE5DD014B25A65FA7EE2F0211B712B679D39FF2AC7ABCDF78D64E7FB10CC9B66196A7D6E0808DEE9E5F448C3E49081AFEDA9237B7DBF80BF860EC2C4A2424F81FF9F5439DAF1DE53C8473945D57D927453611FE1C501B36E2B8B315E9C8B6A26035DA2DDA4DAACA2C12E3E1119F787B047FACAF909E65EB8E50D532A494E3DF56246D5264A093022CF94AEA6559192CDE9A94FA9C7BEB7033A31FA98CE606B0F477E46A28DC4A223D4BFCF4B5F594F0F14C2BDE47FB0203010001A321301F301D0603551D0E0416041449B722CBBCAAFE15B6DF4F2B4DFC7B15A59CA891300D06092A864886F70D01010B0500038201010080F74FD418943C4687104EC7FC65B696523FF4AEBB0AE765E1F53448F398D0B61EA9780AA61DB6169F5A5E8CAD99BC86B8D707B363EEEF98FB7CF1A1647521C410C0B3AB6018BA43F0C710D5AA2A0054EAA4F3A05F0D02792B36D365E78D68F957AD743F491F2ED24C1F24BC417FBAC768E9B44534B7F93F778794523E56B46765F4E7A579872C68874867ECC48FF0F1310334E938EF8B3B42C204C58AB611C8437A65A0447BA169B5787D8053BFA07B451380DE4D0871FBF787C04E458E2F787E40E13D1868C22CA6079886C6ABACB9343F292312B3480EAB2A4F1B1897126DF44855E205A241888D5566557DCA91E38A9DB39D2371BFBA293281D6FA01AE4E"),
+ new Pair<>("org.onionshare.android.fdroid", "3082036130820249A003020102020417F0CECC300D06092A864886F70D01010B05003060310B300906035504061302554B310C300A060355040813034F5247310C300A060355040713034F524731133011060355040A130A6664726F69642E6F7267310F300D060355040B13064644726F6964310F300D060355040313064644726F69643020170D3234303132323136353830365A180F32303531303630393136353830365A3060310B300906035504061302554B310C300A060355040813034F5247310C300A060355040713034F524731133011060355040A130A6664726F69642E6F7267310F300D060355040B13064644726F6964310F300D060355040313064644726F696430820122300D06092A864886F70D01010105000382010F003082010A0282010100E307535DCE692D18C762047ABB55078A212C153AE06A8482A3C96F30A17B0D22288C1175C74FD5219D8F27A95BE9BDCF5D8CE71EC1BF41EFDE4CB12F0E29BB8492AE888549F25D9C0FE3E167532AC972BFCE1EDD3C4804E1C6912A791BFCBFA339C97DB2BCFDAAED2FD0D16230296EBFABD7472746C55ED72A91038F19C7CCCA496C7482C963256A22BCFF521FEE9804357416185EF93400636A75053DBD2733D1C85169FB48C89DA8395FBB981CB43BC5EB3191428CF520355E1D1C905A01708A659ED5BF584D8A40311149772C746B732FCA254C4E053357642A76B9266E265AFF19BB7638BDA5386F8586B56F0863DCB2F6C049FC03884ECB5991D344E1FF0203010001A321301F301D0603551D0E041604144EC58626660297B03818CB334A17BC3B980B3631300D06092A864886F70D01010B050003820101008BB00F8187A9CFB3EA1654BB13C9ADFA2524B8218D621F35BE3C945D68B0F08880ABF734EDBEB400D1C6BFB4CA2E72BAA68C08F8B7A17391A14B4C44E91CA6381A8A0560C0A01481FC69D5CCDC1CA5689B3C8CE6032C7501D06BEE3629E52B6300ED70DA33A7FFECA3C5F69D12FE22BF89A348357B2069796C305B6622B865491AAE349547D29B8D969E5D10DB368474856F14DF340DBD051EBCC3EA5B78DE9A6592B78963A31E5F561BC9446B662B8139E78E5F0381AA5336AD66A5F038833F99FBCC228EAC5D7C55D75D6D5A487FB0E7233D9F2FC903DFF5E33D8AD53FCA6727FAA1DDF38458686C305E41E668796D7E7D8F57607F0DD9DF59F2FF9085B3DF")
+ ); + );
+ for (Pair<String, String> pair : ORBOT_LOCKDOWN_ALLOWLIST) { + for (Pair<String, String> pair : ORBOT_LOCKDOWN_ALLOWLIST) {
+ try { + try {

2
Patches/Linux

@ -1 +1 @@
Subproject commit 77e9d18f7394497d777b70658bc8d0d4ddd14af9 Subproject commit d0e3877034ecb412f0ebb82e75490952e9b9c11d

2
Scripts/LineageOS-21.0/Patch.sh
View File

@ -69,7 +69,7 @@ applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Runtime_Control-3.patch"; #Suppo
applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-1.patch"; #Disable hardened_malloc for Pixel camera provider service (GrapheneOS) applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-1.patch"; #Disable hardened_malloc for Pixel camera provider service (GrapheneOS)
applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-2.patch"; #Disable hardened_malloc for surfaceflinger (GrapheneOS) applyPatch "$DOS_PATCHES/android_bionic/0001-HM-Workaround-2.patch"; #Disable hardened_malloc for surfaceflinger (GrapheneOS)
applyPatch "$DOS_PATCHES/android_bionic/0001-HM-No_GWP_ASan.patch"; #Never enable GWP-ASan (GrapheneOS) applyPatch "$DOS_PATCHES/android_bionic/0001-HM-No_GWP_ASan.patch"; #Never enable GWP-ASan (GrapheneOS)
applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS) applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-1.patch"; #Add a real explicit_bzero implementation (GrapheneOS) #TODO REBASE
#applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-2.patch"; #Replace brk and sbrk with stubs (GrapheneOS) #XXX: some vendor blobs use sbrk
#applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom #applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-3.patch"; #Use blocking getrandom and avoid urandom fallback (GrapheneOS) #XXX: some kernels do not have (working) getrandom
applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-4.patch"; #Fix undefined out-of-bounds accesses in sched.h (GrapheneOS) applyPatch "$DOS_PATCHES/android_bionic/0002-Graphene_Bionic_Hardening-4.patch"; #Fix undefined out-of-bounds accesses in sched.h (GrapheneOS)