diff options
| author | Greg Hackmann <ghackmann@google.com> | 2015-03-19 19:41:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-19 19:41:58 +0000 |
| commit | b3b088e62308f8a61a27677a968a9e513a8582bc (patch) | |
| tree | 76f69e151481747980730e705b5fefc3adcfe226 | |
| parent | 99938804a5aa07dd21005a94afd95af3b6e759ba (diff) | |
| parent | 38eb58d2a808778d13afc570a82ab2534321be70 (diff) | |
| download | system_core-b3b088e62308f8a61a27677a968a9e513a8582bc.zip system_core-b3b088e62308f8a61a27677a968a9e513a8582bc.tar.gz system_core-b3b088e62308f8a61a27677a968a9e513a8582bc.tar.bz2 | |
Merge "pixelflinger: make self-contained"
| -rw-r--r-- | libpixelflinger/Android.mk | 2 | ||||
| -rw-r--r-- | libpixelflinger/include/pixelflinger/format.h (renamed from include/pixelflinger/format.h) | 0 | ||||
| -rw-r--r-- | libpixelflinger/include/pixelflinger/pixelflinger.h (renamed from include/pixelflinger/pixelflinger.h) | 0 | ||||
| -rw-r--r-- | libpixelflinger/include/private/pixelflinger/ggl_context.h (renamed from include/private/pixelflinger/ggl_context.h) | 0 | ||||
| -rw-r--r-- | libpixelflinger/include/private/pixelflinger/ggl_fixed.h (renamed from include/private/pixelflinger/ggl_fixed.h) | 0 | ||||
| -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, 5 insertions, 6 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index aa614bc..697db25 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 index 82eeca4..82eeca4 100644 --- a/include/pixelflinger/format.h +++ b/libpixelflinger/include/pixelflinger/format.h diff --git a/include/pixelflinger/pixelflinger.h b/libpixelflinger/include/pixelflinger/pixelflinger.h index 8a2b442..8a2b442 100644 --- a/include/pixelflinger/pixelflinger.h +++ b/libpixelflinger/include/pixelflinger/pixelflinger.h diff --git a/include/private/pixelflinger/ggl_context.h b/libpixelflinger/include/private/pixelflinger/ggl_context.h index d43655c..d43655c 100644 --- a/include/private/pixelflinger/ggl_context.h +++ b/libpixelflinger/include/private/pixelflinger/ggl_context.h diff --git a/include/private/pixelflinger/ggl_fixed.h b/libpixelflinger/include/private/pixelflinger/ggl_fixed.h index 787f620..787f620 100644 --- a/include/private/pixelflinger/ggl_fixed.h +++ b/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 961f323..448d298 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 8f62f09..d8f7e69 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 bc07015..2f9ca2f 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 f479fa1..75bd39e 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 |