libhybris

Merge ~vicamo/libhybris/+git/libhybris:for-ubuntu/build-multilib-compat into ~libhybris-maintainers/libhybris/+git/libhybris:master

  1. Git
  2. lp:~vicamo/libhybris/+git/libhybris
  3. for-ubuntu/build-multilib-compat
  4. Merge into master
Proposed by You-Sheng Yang
Status: Merged
Approved by: Simon Fels
Approved revision: b27435fdb5b97494a2eb4da310a6cd2024f67903
Merged at revision: dcd06dd8f1bced2b2d7074954325053329354d29
Proposed branch: ~vicamo/libhybris/+git/libhybris:for-ubuntu/build-multilib-compat
Merge into: ~libhybris-maintainers/libhybris/+git/libhybris:master
Diff against target: 156 lines (+20/-32)
5 files modified
compat/camera/Android.mk (+4/-5)
compat/input/Android.mk (+4/-5)
compat/media/Android.mk (+8/-14)
compat/surface_flinger/Android.mk (+4/-5)
compat/ui/Android.mk (+0/-3)
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+302520@code.launchpad.net

Description of the change

compat: always build binaries for both arch

* obsoletes BOARD_HAS_64_BIT_MEDIA_SERVICE introduced in commit e208a00 because binaries for both arch are built from now on.
* on 32 bit Ubuntu rootfs, <module> and <module>_64 are installed, while on 64 bit one, specified by "BOARD_UBUNTU_PREFER_32_BIT:=false", <module> and <module>_32 are installed.

To post a comment you must log in.
Revision history for this message
You-Sheng Yang (vicamo) wrote :

This, along with https://code.launchpad.net/~vicamo/libhybris/+git/libhybris/+merge/302263 , verified on avila vivid+armhf & xenial+arm64.

Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/compat/camera/Android.mk b/compat/camera/Android.mk
2index ce88aaa..431590e 100644
3--- a/compat/camera/Android.mk
4+++ b/compat/camera/Android.mk
5@@ -8,9 +8,6 @@ LOCAL_SRC_FILES := camera_compatibility_layer.cpp
6
7 LOCAL_MODULE := libcamera_compat_layer
8 LOCAL_MODULE_TAGS := optional
9-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
10- LOCAL_32_BIT_ONLY := true
11-endif
12
13 LOCAL_C_INCLUDES := \
14 $(HYBRIS_PATH)/include
15@@ -34,8 +31,10 @@ LOCAL_SRC_FILES := direct_camera_test.cpp
16
17 LOCAL_MODULE := direct_camera_test
18 LOCAL_MODULE_TAGS := optional
19-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
20- LOCAL_32_BIT_ONLY := true
21+ifdef TARGET_2ND_ARCH
22+LOCAL_MULTILIB := both
23+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
24+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
25 endif
26
27 LOCAL_C_INCLUDES := \
28diff --git a/compat/input/Android.mk b/compat/input/Android.mk
29index b2ec336..79c4525 100644
30--- a/compat/input/Android.mk
31+++ b/compat/input/Android.mk
32@@ -10,9 +10,6 @@ LOCAL_SRC_FILES:= input_compatibility_layer.cpp
33
34 LOCAL_MODULE:= libis_compat_layer
35 LOCAL_MODULE_TAGS := optional
36-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
37- LOCAL_32_BIT_ONLY := true
38-endif
39
40 LOCAL_SHARED_LIBRARIES := \
41 libinput \
42@@ -56,8 +53,10 @@ LOCAL_SRC_FILES:= \
43
44 LOCAL_MODULE:= direct_input_test
45 LOCAL_MODULE_TAGS := optional
46-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
47- LOCAL_32_BIT_ONLY := true
48+ifdef TARGET_2ND_ARCH
49+LOCAL_MULTILIB := both
50+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
51+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
52 endif
53
54 LOCAL_C_INCLUDES := \
55diff --git a/compat/media/Android.mk b/compat/media/Android.mk
56index f6866a4..2894983 100644
57--- a/compat/media/Android.mk
58+++ b/compat/media/Android.mk
59@@ -34,8 +34,10 @@ endif
60
61 LOCAL_MODULE := camera_service
62
63-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
64- LOCAL_32_BIT_ONLY := true
65+ifdef TARGET_2ND_ARCH
66+LOCAL_MULTILIB := both
67+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
68+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
69 endif
70
71 include $(BUILD_EXECUTABLE)
72@@ -80,9 +82,6 @@ endif
73
74 LOCAL_MODULE:= libmedia_compat_layer
75 LOCAL_MODULE_TAGS := optional
76-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
77- LOCAL_32_BIT_ONLY := true
78-endif
79
80 LOCAL_SHARED_LIBRARIES := \
81 libcutils \
82@@ -130,10 +129,6 @@ LOCAL_C_INCLUDES+= \
83 $(TOP)/$(MTK_PATH_SOURCE)/frameworks/av/include
84 endif
85
86-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
87- LOCAL_32_BIT_ONLY := true
88-endif
89-
90 include $(BUILD_SHARED_LIBRARY)
91
92 # -------------------------------------------------
93@@ -146,9 +141,6 @@ LOCAL_SRC_FILES:= \
94
95 LOCAL_MODULE:= direct_media_test
96 LOCAL_MODULE_TAGS := optional
97-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
98- LOCAL_32_BIT_ONLY := true
99-endif
100
101 LOCAL_C_INCLUDES := \
102 $(HYBRIS_PATH)/include \
103@@ -172,8 +164,10 @@ LOCAL_SHARED_LIBRARIES := \
104 libEGL \
105 libGLESv2
106
107-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
108- LOCAL_32_BIT_ONLY := true
109+ifdef TARGET_2ND_ARCH
110+LOCAL_MULTILIB := both
111+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
112+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
113 endif
114
115 include $(BUILD_EXECUTABLE)
116diff --git a/compat/surface_flinger/Android.mk b/compat/surface_flinger/Android.mk
117index 8083526..1ef7764 100644
118--- a/compat/surface_flinger/Android.mk
119+++ b/compat/surface_flinger/Android.mk
120@@ -9,9 +9,6 @@ LOCAL_SRC_FILES:= \
121
122 LOCAL_MODULE:= libsf_compat_layer
123 LOCAL_MODULE_TAGS := optional
124-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
125- LOCAL_32_BIT_ONLY := true
126-endif
127
128 LOCAL_C_INCLUDES := \
129 $(HYBRIS_PATH)/include
130@@ -34,8 +31,10 @@ LOCAL_SRC_FILES:= \
131
132 LOCAL_MODULE:= direct_sf_test
133 LOCAL_MODULE_TAGS := optional
134-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
135- LOCAL_32_BIT_ONLY := true
136+ifdef TARGET_2ND_ARCH
137+LOCAL_MULTILIB := both
138+LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
139+LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
140 endif
141
142 LOCAL_C_INCLUDES := \
143diff --git a/compat/ui/Android.mk b/compat/ui/Android.mk
144index 3ffe31e..5cfa6c2 100644
145--- a/compat/ui/Android.mk
146+++ b/compat/ui/Android.mk
147@@ -9,9 +9,6 @@ LOCAL_SRC_FILES:= \
148
149 LOCAL_MODULE:= libui_compat_layer
150 LOCAL_MODULE_TAGS := optional
151-ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
152- LOCAL_32_BIT_ONLY := true
153-endif
154
155 LOCAL_C_INCLUDES := \
156 $(HYBRIS_PATH)/include \

Subscribers

People subscribed via source and target branches