misc changes

Android-Boot-Manager · Aug 2, 2024 · c60b106 · c60b106
1 parent b6cc83e
commit c60b106
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 38 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
             useLegacyPackaging = false
         }
         jniLibs {
-            useLegacyPackaging = true
+            useLegacyPackaging = false
         }
         resources {
             excludes += "META-INF/*.version"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,26 +30,20 @@
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 
-				<!--<category android:name="android.intent.category.LAUNCHER" />-->
+				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
 		<activity
 			android:name=".Simulator"
-			android:exported="true"
+			android:exported="false"
 			android:process=":simulator"
 			android:taskAffinity=""
 			android:noHistory="true"
 			android:screenOrientation="nosensor"
 			android:excludeFromRecents="true"
 			android:configChanges="keyboard|keyboardHidden|uiMode"
 			android:theme="@style/Simulator"
-			tools:ignore="DiscouragedApi">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
+			tools:ignore="DiscouragedApi" />
 	</application>
 
 </manifest>
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -32,5 +32,3 @@ add_library(${CMAKE_PROJECT_NAME} SHARED app.cpp)
 # can link libraries from various origins, such as libraries defined in this
 # build script, prebuilt third-party libraries, or Android system libraries.
 target_link_libraries(${CMAKE_PROJECT_NAME}	droidboot_gui)
-target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer)
-target_link_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize=undefined)
diff --git a/app/src/main/cpp/droidboot_gui b/app/src/main/cpp/droidboot_gui
diff --git a/app/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so b/app/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so
diff --git a/app/src/main/resources/lib/arm64-v8a/wrap.sh b/app/src/main/resources/lib/arm64-v8a/wrap.sh
+1 −3		CMakeLists.txt
+26 −0		common/droidboot_init.c
+1 −1		common/droidboot_main.c
+2 −1		config_parser/droidboot_config.c
+1 −1		droidboot_platforms
+5 −3		dualboot_gui/dualboot_menu.c
+3 −2		lib/lv_conf.h