diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-06-29 18:23:54 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-07-26 17:29:13 +0200 |
| commit | 43983cdb532303224be896ec37e67fa515d87e3e (patch) | |
| tree | 1363b7729fc30967f8e9fd56bbd48867bf7ecf66 /Android.mk | |
| parent | e4840993bbc77d640cb2d4c866e8e60e2deb27a9 (diff) | |
| download | hardware_replicant_libsamsung-ipc-43983cdb532303224be896ec37e67fa515d87e3e.tar.gz hardware_replicant_libsamsung-ipc-43983cdb532303224be896ec37e67fa515d87e3e.tar.bz2 hardware_replicant_libsamsung-ipc-43983cdb532303224be896ec37e67fa515d87e3e.zip | |
Android.mk: fix missing files and build local-modules in guix.scm
In the commit 5f97bb60091a1c4d4335fd02eff2b01e27e7a881 ("tools:
ipc-modem: Move log functions in their own file"), we added new files
for ipc-modem.
That commit was then tested with scripts/guix.scm, which at the time
didn't build ipc-modem, so the issue slipped through the automatic
tests.
So in addition of adding back these missing files in Android.mk, this
commit also makes guix.scm actually build all the local modules.
This was not done before as it required some extensive work.
That work consisted in adding code to retrieve the LOCAL_MODULEs from
the Android.mk, and passing that to the package build and install
procedures (which had to be converted into Guix's G-Expressions
(gexp)[1] to be able to more cleanly get that data). In addition,
making contributions to android-make-stub was needed as well.
Having some of the parsing done in the guix.scm file instead of
android-make-stub is needed because otherwise the android-make-stub
design would probably need to be redone: android-make-stub consists of
some Makefiles that are passed to make via -f, and that in turn
these Makefiles include the Android.mk in the local directory.
This doesn't make it possible to handle dependencies cleanly, as to do
that, the Android.mk would need to first be parsed through another
mean to understand the dependencies tree, and then to build the local
modules in order.
And that would need to be done in some compatible way not to break
existing users of android-make-stub (like Guix that builds some
Android packages with it).
[1]https://guix.gnu.org/en/manual/devel/en/guix.html#G_002dExpressions
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -186,7 +186,9 @@ include $(LOCAL_PATH)/android_versions.mk LOCAL_MODULE := ipc-modem LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := tools/ipc-modem/ipc-modem.c +LOCAL_SRC_FILES := \ + tools/ipc-modem/ipc-modem.c \ + tools/ipc-modem/ipc-modem-log.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/tools/include/glibc LOCAL_SHARED_LIBRARIES := libsamsung-ipc @@ -202,7 +204,9 @@ include $(LOCAL_PATH)/android_versions.mk LOCAL_MODULE := ipc-modem-static LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := tools/ipc-modem/ipc-modem.c +LOCAL_SRC_FILES := \ + tools/ipc-modem/ipc-modem.c \ + tools/ipc-modem/ipc-modem-log.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/tools/include/glibc LOCAL_STATIC_LIBRARIES := libsamsung-ipc |