Simplify par Launcher
Instead of copying some of Py_Main and changing it, use Py_Main
directly, paired with a __main__.py script that uses the runpy module to
trampoline into the user code.
Test: build/soong/python/tests/runtest.sh
Change-Id: I7f5e1e38b63b4e2ce83a85c08953a5e67c7b8788
diff --git a/Android.bp b/Android.bp
index 5497151..2a56885 100644
--- a/Android.bp
+++ b/Android.bp
@@ -225,7 +225,6 @@
],
srcs: [
"Launcher/launcher_main.cpp",
- "Launcher/launcher_internal.cpp",
"Modules/gcmodule.c",
"Modules/getpath.c",
"Modules/config.c",
@@ -241,9 +240,7 @@
"Modules/_weakref.c",
"Modules/zipimport.c",
"Modules/symtablemodule.c",
- ],
- local_include_dirs: [
- "Launcher",
+ "Modules/main.c",
],
// NOTE: Please update Modules/config.c if new lib get added in the static_libs.
static_libs: [
@@ -315,21 +312,14 @@
target: {
linux_glibc_x86_64: {
host_ldlibs: ["-lutil"],
- static_libs: [
- "libsqlite",
- ],
},
- darwin_x86_64: {
- static_libs: [
- "libsqlite",
- ],
+ host: {
+ static_libs: ["libsqlite"],
},
// Use shared libsqlite for device side, otherwise
// the executable size will be really huge.
android: {
- shared_libs: [
- "libsqlite",
- ],
+ shared_libs: ["libsqlite"],
},
},
}