From fd46fe102a918ef7536bae668f14c6c161edcf5c Mon Sep 17 00:00:00 2001 From: Paul Eastham Date: Mon, 16 Mar 2015 19:01:38 +0000 Subject: [PATCH] Revert "pixelflinger: make self-contained" This reverts commit 56350fe387e77824a1e360d39a22f983b0a8ab20. Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52 --- {libpixelflinger/include => include}/pixelflinger/format.h | 0 .../include => include}/pixelflinger/pixelflinger.h | 0 .../include => include}/private/pixelflinger/ggl_context.h | 0 .../include => include}/private/pixelflinger/ggl_fixed.h | 0 libpixelflinger/Android.mk | 2 -- libpixelflinger/tests/arch-arm64/assembler/Android.mk | 2 +- libpixelflinger/tests/arch-arm64/disassembler/Android.mk | 3 +++ libpixelflinger/tests/codegen/Android.mk | 2 +- libpixelflinger/tests/gglmul/Android.mk | 2 +- 9 files changed, 6 insertions(+), 5 deletions(-) rename {libpixelflinger/include => include}/pixelflinger/format.h (100%) rename {libpixelflinger/include => include}/pixelflinger/pixelflinger.h (100%) rename {libpixelflinger/include => include}/private/pixelflinger/ggl_context.h (100%) rename {libpixelflinger/include => include}/private/pixelflinger/ggl_fixed.h (100%) diff --git a/libpixelflinger/include/pixelflinger/format.h b/include/pixelflinger/format.h similarity index 100% rename from libpixelflinger/include/pixelflinger/format.h rename to include/pixelflinger/format.h diff --git a/libpixelflinger/include/pixelflinger/pixelflinger.h b/include/pixelflinger/pixelflinger.h similarity index 100% rename from libpixelflinger/include/pixelflinger/pixelflinger.h rename to include/pixelflinger/pixelflinger.h diff --git a/libpixelflinger/include/private/pixelflinger/ggl_context.h b/include/private/pixelflinger/ggl_context.h similarity index 100% rename from libpixelflinger/include/private/pixelflinger/ggl_context.h rename to include/private/pixelflinger/ggl_context.h diff --git a/libpixelflinger/include/private/pixelflinger/ggl_fixed.h b/include/private/pixelflinger/ggl_fixed.h similarity index 100% rename from libpixelflinger/include/private/pixelflinger/ggl_fixed.h rename to 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