Revert "pixelflinger: make self-contained"

This reverts commit 56350fe. Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
jiangpingliu · Mar 16, 2015 · cc255b4 · cc255b4
1 parent 56350fe
commit cc255b4
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 5 deletions.
diff --git a/...ixelflinger/include/pixelflinger/format.h → include/pixelflinger/format.h b/...ixelflinger/include/pixelflinger/format.h → include/pixelflinger/format.h
diff --git a/...inger/include/pixelflinger/pixelflinger.h → include/pixelflinger/pixelflinger.h b/...inger/include/pixelflinger/pixelflinger.h → include/pixelflinger/pixelflinger.h
diff --git a/...nclude/private/pixelflinger/ggl_context.h → include/private/pixelflinger/ggl_context.h b/...nclude/private/pixelflinger/ggl_context.h → include/private/pixelflinger/ggl_context.h
diff --git a/.../include/private/pixelflinger/ggl_fixed.h → include/private/pixelflinger/ggl_fixed.h b/.../include/private/pixelflinger/ggl_fixed.h → include/private/pixelflinger/ggl_fixed.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES :=
 
 LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/../../include
+	system/core/libpixelflinger
 
 LOCAL_MODULE:= test-pixelflinger-gglmul