Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[arm64] force build of 32bit binaries if target arch is arm64 #97

Merged
merged 1 commit into from Jan 4, 2017
Merged

[arm64] force build of 32bit binaries if target arch is arm64 #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Android.mk
View file
Open in desktop
Expand Up @@ -265,10 +265,11 @@ HYBRIS_UPDATER_UNPACK := $(LOCAL_BUILD_MODULE)

.PHONY: hybris-hal hybris-common

hybris-common: bootimage hybris-updater-unpack hybris-updater-script hybris-recovery hybris-boot servicemanager logcat updater init adb adbd
hybris-common: bootimage hybris-updater-unpack hybris-updater-script hybris-recovery hybris-boot servicemanager logcat updater init adb adbd linker libc libEGL libGLESv1_CM libGLESv2

ifeq ("$(TARGET_ARCH)", "arm64")
hybris-hal: hybris-common linker_32 libc_32 libEGL_32 libGLESv1_CM_32 libGLESv2_32
hybris-hal: hybris-common linker_32 libc_32 libEGL_32 libGLESv1_CM_32 libGLESv2_32
else
hybris-hal: hybris-common linker libc libEGL libGLESv1_CM libGLESv2
hybris-hal: hybris-common
endif