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

Commit 1410dff1 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Use correct TLS codepath in graphics libraries"

parents d43a216f 9166f7bf

opengl/libagl/Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ endif 


ifneq ($(TARGET_SIMULATOR),true)

    # we need to access the private Bionic header <bionic_tls.h>

    # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER

    # behavior from the bionic Android.mk file

    ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true)

        LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

    endif

    LOCAL_C_INCLUDES += bionic/libc/private

endif

opengl/libs/Android.mk

+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ LOCAL_MODULE:= libEGL 
ifeq ($(TARGET_SIMULATOR),true)

else

    LOCAL_SHARED_LIBRARIES += libdl

    # Bionic's private TLS header relies on the ARCH_ARM_HAVE_TLS_REGISTER to

    # select the appropriate TLS codepath

    ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

        LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

    endif

    # we need to access the private Bionic header <bionic_tls.h>

    LOCAL_C_INCLUDES += bionic/libc/private

endif
@@ -75,6 +80,9 @@ ifeq ($(TARGET_SIMULATOR),true) 
else

    LOCAL_SHARED_LIBRARIES += libdl

    # we need to access the private Bionic header <bionic_tls.h>

    ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

        LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

    endif

    LOCAL_C_INCLUDES += bionic/libc/private

endif
@@ -108,6 +116,9 @@ ifeq ($(TARGET_SIMULATOR),true) 
else

    LOCAL_SHARED_LIBRARIES += libdl

    # we need to access the private Bionic header <bionic_tls.h>

    ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)

        LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

    endif

    LOCAL_C_INCLUDES += bionic/libc/private

endif