libhybris

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

  1. Git
  2. lp:~vicamo/libhybris/+git/libhybris
  3. for-ubuntu/arm64-compat
  4. Merge into master
Proposed by You-Sheng Yang
Status: Merged
Merged at revision: 4b1a19c195e93a2075244aa0c69f9c40ae94373b
Proposed branch: ~vicamo/libhybris/+git/libhybris:for-ubuntu/arm64-compat
Merge into: ~libhybris-maintainers/libhybris/+git/libhybris:master
Diff against target: 151 lines (+36/-12)
5 files modified
compat/camera/Android.mk (+6/-2)
compat/input/Android.mk (+6/-2)
compat/media/Android.mk (+15/-5)
compat/surface_flinger/Android.mk (+6/-2)
compat/ui/Android.mk (+3/-1)
Reviewer Review Type Date Requested Status
Libhybris Maintainers Pending
Review via email: mp+301986@code.launchpad.net

Description of the change

compat: build also arm64 flavor

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

Probably need to compile on current turbo/avila armhf tree before requesting for review.

Revision history for this message
You-Sheng Yang (vicamo) wrote :

We need to introduce some kind of mechanism to specify that we need arm64 variants of libhybris compat libraries, or this patch will break existing armhf builds. How about adding a BOARD_UBUNTU_ARCH variable since we've already had BOARD_HAS_MEDIA_{RECORDER_PAUSE,RECORDER_RESUME,CODEC_SOURCE} in libhybris?

Revision history for this message
You-Sheng Yang (vicamo) wrote :

[push 32eae28] use ifeq guards to conditionally enable arm64 variants builds. BOARD_HAS_64_BIT_MEDIA_SERVICE is used instead per IRC discuss.

Revision history for this message
You-Sheng Yang (vicamo) wrote :

[push 2b59d16] compile all test programs as amr64 when appropriate, too. It's probably meaningless to test arm64 libmediaplayerservice with arm32 test tools.

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 1b8f42c..ce88aaa 100644
3--- a/compat/camera/Android.mk
4+++ b/compat/camera/Android.mk
5@@ -8,7 +8,9 @@ LOCAL_SRC_FILES := camera_compatibility_layer.cpp
6
7 LOCAL_MODULE := libcamera_compat_layer
8 LOCAL_MODULE_TAGS := optional
9-LOCAL_32_BIT_ONLY := true
10+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
11+ LOCAL_32_BIT_ONLY := true
12+endif
13
14 LOCAL_C_INCLUDES := \
15 $(HYBRIS_PATH)/include
16@@ -32,7 +34,9 @@ LOCAL_SRC_FILES := direct_camera_test.cpp
17
18 LOCAL_MODULE := direct_camera_test
19 LOCAL_MODULE_TAGS := optional
20-LOCAL_32_BIT_ONLY := true
21+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
22+ LOCAL_32_BIT_ONLY := true
23+endif
24
25 LOCAL_C_INCLUDES := \
26 $(HYBRIS_PATH)/include \
27diff --git a/compat/input/Android.mk b/compat/input/Android.mk
28index 16ebf2b..b2ec336 100644
29--- a/compat/input/Android.mk
30+++ b/compat/input/Android.mk
31@@ -10,7 +10,9 @@ LOCAL_SRC_FILES:= input_compatibility_layer.cpp
32
33 LOCAL_MODULE:= libis_compat_layer
34 LOCAL_MODULE_TAGS := optional
35-LOCAL_32_BIT_ONLY := true
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@@ -54,7 +56,9 @@ LOCAL_SRC_FILES:= \
43
44 LOCAL_MODULE:= direct_input_test
45 LOCAL_MODULE_TAGS := optional
46-LOCAL_32_BIT_ONLY := true
47+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
48+ LOCAL_32_BIT_ONLY := true
49+endif
50
51 LOCAL_C_INCLUDES := \
52 $(HYBRIS_PATH)/include \
53diff --git a/compat/media/Android.mk b/compat/media/Android.mk
54index 45fdca0..f6866a4 100644
55--- a/compat/media/Android.mk
56+++ b/compat/media/Android.mk
57@@ -34,7 +34,9 @@ endif
58
59 LOCAL_MODULE := camera_service
60
61-LOCAL_32_BIT_ONLY := true
62+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
63+ LOCAL_32_BIT_ONLY := true
64+endif
65
66 include $(BUILD_EXECUTABLE)
67
68@@ -78,7 +80,9 @@ endif
69
70 LOCAL_MODULE:= libmedia_compat_layer
71 LOCAL_MODULE_TAGS := optional
72-LOCAL_32_BIT_ONLY := true
73+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
74+ LOCAL_32_BIT_ONLY := true
75+endif
76
77 LOCAL_SHARED_LIBRARIES := \
78 libcutils \
79@@ -126,7 +130,9 @@ LOCAL_C_INCLUDES+= \
80 $(TOP)/$(MTK_PATH_SOURCE)/frameworks/av/include
81 endif
82
83-LOCAL_32_BIT_ONLY := true
84+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
85+ LOCAL_32_BIT_ONLY := true
86+endif
87
88 include $(BUILD_SHARED_LIBRARY)
89
90@@ -140,7 +146,9 @@ LOCAL_SRC_FILES:= \
91
92 LOCAL_MODULE:= direct_media_test
93 LOCAL_MODULE_TAGS := optional
94-LOCAL_32_BIT_ONLY := true
95+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
96+ LOCAL_32_BIT_ONLY := true
97+endif
98
99 LOCAL_C_INCLUDES := \
100 $(HYBRIS_PATH)/include \
101@@ -164,6 +172,8 @@ LOCAL_SHARED_LIBRARIES := \
102 libEGL \
103 libGLESv2
104
105-LOCAL_32_BIT_ONLY := true
106+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
107+ LOCAL_32_BIT_ONLY := true
108+endif
109
110 include $(BUILD_EXECUTABLE)
111diff --git a/compat/surface_flinger/Android.mk b/compat/surface_flinger/Android.mk
112index 964d3f4..8083526 100644
113--- a/compat/surface_flinger/Android.mk
114+++ b/compat/surface_flinger/Android.mk
115@@ -9,7 +9,9 @@ LOCAL_SRC_FILES:= \
116
117 LOCAL_MODULE:= libsf_compat_layer
118 LOCAL_MODULE_TAGS := optional
119-LOCAL_32_BIT_ONLY := true
120+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
121+ LOCAL_32_BIT_ONLY := true
122+endif
123
124 LOCAL_C_INCLUDES := \
125 $(HYBRIS_PATH)/include
126@@ -32,7 +34,9 @@ LOCAL_SRC_FILES:= \
127
128 LOCAL_MODULE:= direct_sf_test
129 LOCAL_MODULE_TAGS := optional
130-LOCAL_32_BIT_ONLY := true
131+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
132+ LOCAL_32_BIT_ONLY := true
133+endif
134
135 LOCAL_C_INCLUDES := \
136 $(HYBRIS_PATH)/include
137diff --git a/compat/ui/Android.mk b/compat/ui/Android.mk
138index 011ebc3..3ffe31e 100644
139--- a/compat/ui/Android.mk
140+++ b/compat/ui/Android.mk
141@@ -9,7 +9,9 @@ LOCAL_SRC_FILES:= \
142
143 LOCAL_MODULE:= libui_compat_layer
144 LOCAL_MODULE_TAGS := optional
145-LOCAL_32_BIT_ONLY := true
146+ifneq ($(strip $(BOARD_HAS_64_BIT_MEDIA_SERVICE)),true)
147+ LOCAL_32_BIT_ONLY := true
148+endif
149
150 LOCAL_C_INCLUDES := \
151 $(HYBRIS_PATH)/include \

Subscribers

People subscribed via source and target branches