diff options
| -rw-r--r-- | include/pixelflinger/format.h (renamed from libpixelflinger/include/pixelflinger/format.h) | 0 | ||||
| -rw-r--r-- | include/pixelflinger/pixelflinger.h (renamed from libpixelflinger/include/pixelflinger/pixelflinger.h) | 0 | ||||
| -rw-r--r-- | include/private/pixelflinger/ggl_context.h (renamed from libpixelflinger/include/private/pixelflinger/ggl_context.h) | 0 | ||||
| -rw-r--r-- | include/private/pixelflinger/ggl_fixed.h (renamed from libpixelflinger/include/private/pixelflinger/ggl_fixed.h) | 0 | ||||
| -rw-r--r-- | libpixelflinger/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/tests/arch-arm64/assembler/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/tests/arch-arm64/disassembler/Android.mk | 3 | ||||
| -rw-r--r-- | libpixelflinger/tests/codegen/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/tests/gglmul/Android.mk | 2 |
9 files changed, 6 insertions, 5 deletions
diff --git a/libpixelflinger/include/pixelflinger/format.h b/include/pixelflinger/format.h index 82eeca4d7..82eeca4d7 100644 --- a/libpixelflinger/include/pixelflinger/format.h +++ b/include/pixelflinger/format.h diff --git a/libpixelflinger/include/pixelflinger/pixelflinger.h b/include/pixelflinger/pixelflinger.h index 8a2b4421b..8a2b4421b 100644 --- a/libpixelflinger/include/pixelflinger/pixelflinger.h +++ b/include/pixelflinger/pixelflinger.h diff --git a/libpixelflinger/include/private/pixelflinger/ggl_context.h b/include/private/pixelflinger/ggl_context.h index d43655cbb..d43655cbb 100644 --- a/libpixelflinger/include/private/pixelflinger/ggl_context.h +++ b/include/private/pixelflinger/ggl_context.h diff --git a/libpixelflinger/include/private/pixelflinger/ggl_fixed.h b/include/private/pixelflinger/ggl_fixed.h index 787f6202b..787f6202b 100644 --- a/libpixelflinger/include/private/pixelflinger/ggl_fixed.h +++ b/include/private/pixelflinger/ggl_fixed.h diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index 128863dd4..acd18b026 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -62,8 +62,6 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm) LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64) LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS) LOCAL_SHARED_LIBRARIES := libcutils liblog # Really this should go away entirely or at least not depend on diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk index 448d2980e..961f323de 100644 --- a/libpixelflinger/tests/arch-arm64/assembler/Android.mk +++ b/libpixelflinger/tests/arch-arm64/assembler/Android.mk @@ -13,7 +13,7 @@ LOCAL_SHARED_LIBRARIES := \ libpixelflinger LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../.. + system/core/libpixelflinger LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test diff --git a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk index d8f7e699f..8f62f0975 100644 --- a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk +++ b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk @@ -7,6 +7,9 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := +LOCAL_C_INCLUDES := \ + system/core/libpixelflinger/codeflinger + LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test LOCAL_MODULE_TAGS := tests diff --git a/libpixelflinger/tests/codegen/Android.mk b/libpixelflinger/tests/codegen/Android.mk index 2f9ca2f9a..bc0701559 100644 --- a/libpixelflinger/tests/codegen/Android.mk +++ b/libpixelflinger/tests/codegen/Android.mk @@ -9,7 +9,7 @@ LOCAL_SHARED_LIBRARIES := \ libpixelflinger LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../.. + system/core/libpixelflinger LOCAL_MODULE:= test-opengl-codegen diff --git a/libpixelflinger/tests/gglmul/Android.mk b/libpixelflinger/tests/gglmul/Android.mk index 75bd39ef5..f479fa1e8 100644 --- a/libpixelflinger/tests/gglmul/Android.mk +++ b/libpixelflinger/tests/gglmul/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../include + system/core/libpixelflinger LOCAL_MODULE:= test-pixelflinger-gglmul |