From d7de206dbd459e8c8bf121f73755d12569c6cc55 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Mon, 22 Jan 2024 18:30:15 +0530 Subject: Preliminary Android build support (#31086) * Android build * Fixes * More fixes - Still failing in the linking step * More work on getting linking working Signed-off-by: Mukilan Thiyagarajan * android: use mozjs with ndk r25c. loads servo.org more android build fixes. * fix ./mach run for android and make it follow logs Signed-off-by: Mukilan Thiyagarajan * add experimental logic for compositor pause/resume Signed-off-by: Mukilan Thiyagarajan * pass DPI from android to simpleservo Signed-off-by: Mukilan Thiyagarajan * ci: add android workflow Signed-off-by: Mukilan Thiyagarajan * switch to ANDROID_SDK_ROOT and ANDROID_NDK_ROOT vars Signed-off-by: Mukilan Thiyagarajan * upgrade gradle to 4.10.1 Signed-off-by: Mukilan Thiyagarajan * upgrade to gradle 5.1.1 Signed-off-by: Mukilan Thiyagarajan * upgrade to gradle 8 and agp 8 Signed-off-by: Mukilan Thiyagarajan * make compositing work again with external present Signed-off-by: Mukilan Thiyagarajan * android: improve mach support for non-NixOS and CI Signed-off-by: Mukilan Thiyagarajan * fix sampler compilation bug introduced in #30490 Signed-off-by: Mukilan Thiyagarajan * ci: add android build to main workflow Signed-off-by: Mukilan Thiyagarajan * gradle: set MinSdk = targetSdk = 30 NDK requires we compile against the minSdk API level which is 30 in our case. Signed-off-by: Mukilan Thiyagarajan * add instructions for android in README.md Signed-off-by: Mukilan Thiyagarajan * apk: move servosurface to servoview Signed-off-by: Mukilan Thiyagarajan * apk: uncomment the mediasession callbacks on MainActivity Signed-off-by: Mukilan Thiyagarajan * apk: fix crash on MainAtivity.onDestroy Signed-off-by: Mukilan Thiyagarajan * apk: drop VR, arm 5 and unused code This commit drops: * support for google, oculusvr * support for arm5 architecture and also removes * fakeld scripts * unused java code Signed-off-by: Mukilan Thiyagarajan * cleanup shell.nix Signed-off-by: Mukilan Thiyagarajan * android: add FIXMEs for gstreamer code Signed-off-by: Mukilan Thiyagarajan * apk: remove commented code and debug logs Signed-off-by: Mukilan Thiyagarajan * cleanup ServoView.java Signed-off-by: Mukilan Thiyagarajan * mach: comment call to download gstreamer deps for android Signed-off-by: Mukilan Thiyagarajan * disable bluetooth for jniapi as blurdroid is broken Signed-off-by: Mukilan Thiyagarajan * fixup! README.md * fixup! remove change in Cargo.toml * fixup! move shell variables together * fixup! cleanup jniapi/Cargo.toml comments * delete commented gstreamer related android code Signed-off-by: Mukilan Thiyagarajan * remove unused config variable in servbuild Signed-off-by: Mukilan Thiyagarajan * android: more cleanup Signed-off-by: Mukilan Thiyagarajan * force no_static_freetype only for android * use actions to manage sdk, ndk and java Signed-off-by: Mukilan Thiyagarajan * rename embedder event names to be more clear. Signed-off-by: Mukilan Thiyagarajan * link to startup crash issue Signed-off-by: Mukilan Thiyagarajan * fix lint issues Signed-off-by: Mukilan Thiyagarajan * upgrade env_logger to 0.10 with duplicate exception libservo and android_logger can use env_logger 0.10 but quickcheck is still stuck on 0.8 and has not seen any activity in the last 2 years. This commit adds a duplicate exception until the quickcheck dependency can be upgraded (or replaced) Signed-off-by: Mukilan Thiyagarajan * android: fix comments Signed-off-by: Mukilan Thiyagarajan * disable jemalloc on android Signed-off-by: Mukilan Thiyagarajan * fixup! replace linux with android in cfg --------- Signed-off-by: Mukilan Thiyagarajan Co-authored-by: Martin Robinson --- python/servo/package_commands.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'python/servo/package_commands.py') diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 62ae60f5fa6..ab8cbacb2cd 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -160,7 +160,7 @@ class PackageCommands(CommandBase): else: raise Exception("TODO what should this be?") - flavor_name = "Main" + flavor_name = "Basic" if flavor is not None: flavor_name = flavor.title() @@ -176,10 +176,7 @@ class PackageCommands(CommandBase): variant = ":assemble" + flavor_name + arch_string + build_type_string apk_task_name = ":servoapp" + variant aar_task_name = ":servoview" + variant - maven_task_name = ":servoview:uploadArchive" argv = ["./gradlew", "--no-daemon", apk_task_name, aar_task_name] - if maven: - argv.append(maven_task_name) try: with cd(path.join("support", "android", "apk")): subprocess.check_call(argv, env=env) -- cgit v1.2.3