diff options
Diffstat (limited to 'opengl/libs')
| -rw-r--r-- | opengl/libs/Android.bp | 21 | ||||
| -rw-r--r-- | opengl/libs/Android.mk | 29 |
2 files changed, 21 insertions, 29 deletions
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp new file mode 100644 index 0000000000..813fd99a36 --- /dev/null +++ b/opengl/libs/Android.bp @@ -0,0 +1,21 @@ +// Build the ETC1 library +cc_library { + name: "libETC1", + srcs: ["ETC1/etc1.cpp"], + + target: { + android: { + static: { + enabled: false, + }, + }, + host: { + shared: { + enabled: false, + }, + }, + windows: { + enabled: true, + }, + }, +} diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 5074fd085c..dfe0facb49 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -147,33 +147,4 @@ LOCAL_LDFLAGS_arm += -Wl,--hash-style,both include $(BUILD_SHARED_LIBRARY) -############################################################################### -# Build the ETC1 host static library -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - ETC1/etc1.cpp \ -# - -LOCAL_MODULE:= libETC1 -LOCAL_MODULE_HOST_OS := darwin linux windows - -include $(BUILD_HOST_STATIC_LIBRARY) - -############################################################################### -# Build the ETC1 device library -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - ETC1/etc1.cpp \ -# - -LOCAL_MODULE:= libETC1 - -include $(BUILD_SHARED_LIBRARY) - include $(call all-makefiles-under,$(LOCAL_PATH)) |