diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index aa614bc17..697db25e1 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -62,6 +62,8 @@ 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/include/pixelflinger/format.h b/libpixelflinger/include/pixelflinger/format.h similarity index 100% rename from include/pixelflinger/format.h rename to libpixelflinger/include/pixelflinger/format.h diff --git a/include/pixelflinger/pixelflinger.h b/libpixelflinger/include/pixelflinger/pixelflinger.h similarity index 100% rename from include/pixelflinger/pixelflinger.h rename to libpixelflinger/include/pixelflinger/pixelflinger.h diff --git a/include/private/pixelflinger/ggl_context.h b/libpixelflinger/include/private/pixelflinger/ggl_context.h similarity index 100% rename from include/private/pixelflinger/ggl_context.h rename to libpixelflinger/include/private/pixelflinger/ggl_context.h diff --git a/include/private/pixelflinger/ggl_fixed.h b/libpixelflinger/include/private/pixelflinger/ggl_fixed.h similarity index 100% rename from include/private/pixelflinger/ggl_fixed.h rename to libpixelflinger/include/private/pixelflinger/ggl_fixed.h diff --git a/libpixelflinger/tests/arch-arm64/assembler/Android.mk b/libpixelflinger/tests/arch-arm64/assembler/Android.mk index 961f323de..448d2980e 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 := \ - system/core/libpixelflinger + $(LOCAL_PATH)/../../.. 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 8f62f0975..d8f7e699f 100644 --- a/libpixelflinger/tests/arch-arm64/disassembler/Android.mk +++ b/libpixelflinger/tests/arch-arm64/disassembler/Android.mk @@ -7,9 +7,6 @@ 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 bc0701559..2f9ca2f9a 100644 --- a/libpixelflinger/tests/codegen/Android.mk +++ b/libpixelflinger/tests/codegen/Android.mk @@ -9,7 +9,7 @@ LOCAL_SHARED_LIBRARIES := \ libpixelflinger LOCAL_C_INCLUDES := \ - system/core/libpixelflinger + $(LOCAL_PATH)/../.. LOCAL_MODULE:= test-opengl-codegen diff --git a/libpixelflinger/tests/gglmul/Android.mk b/libpixelflinger/tests/gglmul/Android.mk index f479fa1e8..75bd39ef5 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 := \ - system/core/libpixelflinger + $(LOCAL_PATH)/../../include LOCAL_MODULE:= test-pixelflinger-gglmul