LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 02fe35d6: am c969a03b: merge from open-source master

Browse Source 
* commit '02fe35d64f2eb11b6ce8afd046a4d37ee227d1a9':
  Fix device builds
This commit is contained in:
Jean-Baptiste Queru
2011-03-31 09:48:44 -07:00
committed by Android Git Automerger
parent 6c6639d1e2 02fe35d64f
commit 4f1e514c19
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/emulator/opengl/tests/gles_android_wrapper/Android.mk
View File

@@ -40,6 +40,12 @@ LOCAL_STATIC_LIBRARIES := libOpenglCodecCommon
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
#### egl.cfg #### #### egl.cfg ####
# Ensure that this file is only copied to emulator-specific builds.
# Other builds are device-specific and will provide their own
# version of this file to point to the appropriate HW EGL libraries.
#
ifneq (,$(filter full full_x86 sdk sdk_x86,$(TARGET_PRODUCT)))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := egl.cfg LOCAL_MODULE := egl.cfg
@@ -50,6 +56,7 @@ LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86'
#### gles_emul.cfg #### #### gles_emul.cfg ####
include $(CLEAR_VARS) include $(CLEAR_VARS)