Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3db6d606 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge "Don't override target to 32 for Bluetooth"

parents 97f86114 93f4d440

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ LOCAL_SRC_FILES := \ 
        $(call all-java-files-under, lib/mapapi)



LOCAL_MODULE := bluetooth.mapsapi

LOCAL_MULTILIB := 32

include $(BUILD_STATIC_JAVA_LIBRARY)



include $(CLEAR_VARS)
@@ -27,7 +26,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard bluetooth.mapsapi sap-api-java- 
LOCAL_PROTOC_OPTIMIZE_TYPE := micro



LOCAL_REQUIRED_MODULES := bluetooth.default

LOCAL_MULTILIB := 32



LOCAL_PROGUARD_ENABLED := disabled

jni/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libhardware



LOCAL_MULTILIB := 32



LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter



LOCAL_MODULE := libbluetooth_jni