summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch
blob: 38cfa887276c8075bc0aaf450ab39a4988c022ac (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
patching liblog.mk to build in yocto environment.

Changes include:
Introduced an output folder which will keep all the outputs from the
android-tools.

Adding an include file that is setting the common flags.
Changed the cppflag to include the headers from other components
of android-tools

Modified LDflags so that the libraries that are coming from other android-tools
are searched in the output folder.

Modified the build rule so that it outputs the binary to the OUT_DIR

Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>

Upstream-Status: Pending

--- git/system/core/debian/liblog.mk	2021-05-17 08:13:28.304700936 +0000
+++ git/system/core/debian/liblog.mk	2021-05-17 08:15:59.590064282 +0000
@@ -1,3 +1,4 @@
+include ../../rules_yocto.mk
 NAME = liblog
 
 # copied from liblog/Android.bp
@@ -39,11 +40,12 @@
 LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 -lpthread
 
 build: $(COBJECTS) $(CXXOBJECTS)
-	$(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
-	ln -s $(NAME).so.0 $(NAME).so
+	$(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	
+	ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+	cp -r liblog/include/* $(OUT_DIR)/usr/include/	
 
 clean:
-	$(RM) $(COBJECTS) $(CXXOBJECTS) $(NAME).so*
+	$(RM) $(COBJECTS) $(CXXOBJECTS) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so*
 
 $(COBJECTS): %.o: %.c
 	$(CC) $< -o $@ $(CFLAGS) $(CPPFLAGS)