Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 797e2b7661259e1775c8690af049101dc7059272^2..797e2b7661259e1775c8690af049101dc7059272 / .
commit797e2b7661259e1775c8690af049101dc7059272[log] [tgz]
authorMathias Agopian <mathias@google.com>Tue Jul 16 02:18:01 2013 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Tue Jul 16 02:18:01 2013 +0000
tree8dc4b677ea65a4448e9eb74e39f25db23e7cfb64
parent6ba6c664f773a53d7b6ddaf2c216d11404fd18fc [diff]
parentd23255813297fea614f17f4b0ecbd4f99430c67c [diff]
Merge "always pass the BufferQueue explicitely to consumers"
diff --git a/Android.mk b/Android.mk
index 4675d65..d92cfe4 100644
--- a/Android.mk
+++ b/Android.mk

@@ -40,7 +40,7 @@
 LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libLLVM libui libgui libsync
 
 LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
-LOCAL_C_INCLUDES += frameworks/rs/driver/linkloader/include
+LOCAL_C_INCLUDES += frameworks/rs/cpu_ref/linkloader/include
 
 LOCAL_CFLAGS += $(rs_base_CFLAGS)
 
@@ -254,17 +254,17 @@
 #-----------------------------------------------------------------------------
 
 rsloader_SRC_FILES := \
-  driver/linkloader/android/librsloader.cpp \
-  driver/linkloader/lib/ELFHeader.cpp \
-  driver/linkloader/lib/ELFSymbol.cpp \
-  driver/linkloader/lib/ELFSectionHeader.cpp \
-  driver/linkloader/lib/ELFTypes.cpp \
-  driver/linkloader/lib/GOT.cpp \
-  driver/linkloader/lib/MemChunk.cpp \
-  driver/linkloader/lib/StubLayout.cpp \
-  driver/linkloader/utils/helper.cpp \
-  driver/linkloader/utils/raw_ostream.cpp \
-  driver/linkloader/utils/rsl_assert.cpp
+  cpu_ref/linkloader/android/librsloader.cpp \
+  cpu_ref/linkloader/lib/ELFHeader.cpp \
+  cpu_ref/linkloader/lib/ELFSymbol.cpp \
+  cpu_ref/linkloader/lib/ELFSectionHeader.cpp \
+  cpu_ref/linkloader/lib/ELFTypes.cpp \
+  cpu_ref/linkloader/lib/GOT.cpp \
+  cpu_ref/linkloader/lib/MemChunk.cpp \
+  cpu_ref/linkloader/lib/StubLayout.cpp \
+  cpu_ref/linkloader/utils/helper.cpp \
+  cpu_ref/linkloader/utils/raw_ostream.cpp \
+  cpu_ref/linkloader/utils/rsl_assert.cpp
 
 include $(CLEAR_VARS)
 
@@ -279,8 +279,8 @@
 LOCAL_CFLAGS += $(rs_base_CFLAGS)
 
 LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/driver/linkloader \
-  $(LOCAL_PATH)/driver/linkloader/include \
+  $(LOCAL_PATH)/cpu_ref/linkloader \
+  $(LOCAL_PATH)/cpu_ref/linkloader/include \
   $(LOCAL_C_INCLUDES)
 
 include $(LLVM_ROOT_PATH)/llvm-device-build.mk
@@ -305,8 +305,8 @@
 LOCAL_CFLAGS += -D__HOST__
 
 LOCAL_C_INCLUDES := \
-  $(LOCAL_PATH)/driver/linkloader \
-  $(LOCAL_PATH)/driver/linkloader/include \
+  $(LOCAL_PATH)/cpu_ref/linkloader \
+  $(LOCAL_PATH)/cpu_ref/linkloader/include \
   $(LOCAL_C_INCLUDES)
 
 include $(LLVM_ROOT_PATH)/llvm-host-build.mk

diff --git a/driver/linkloader/android/librsloader.cpp b/cpu_ref/linkloader/android/librsloader.cpp
similarity index 100%
rename from driver/linkloader/android/librsloader.cpp
rename to cpu_ref/linkloader/android/librsloader.cpp

diff --git a/driver/linkloader/android/librsloader.h b/cpu_ref/linkloader/android/librsloader.h
similarity index 100%
rename from driver/linkloader/android/librsloader.h
rename to cpu_ref/linkloader/android/librsloader.h

diff --git a/driver/linkloader/android/test-librsloader.c b/cpu_ref/linkloader/android/test-librsloader.c
similarity index 100%
rename from driver/linkloader/android/test-librsloader.c
rename to cpu_ref/linkloader/android/test-librsloader.c

diff --git a/driver/linkloader/include/ELF.h b/cpu_ref/linkloader/include/ELF.h
similarity index 100%
rename from driver/linkloader/include/ELF.h
rename to cpu_ref/linkloader/include/ELF.h

diff --git a/driver/linkloader/include/ELFHeader.h b/cpu_ref/linkloader/include/ELFHeader.h
similarity index 100%
rename from driver/linkloader/include/ELFHeader.h
rename to cpu_ref/linkloader/include/ELFHeader.h

diff --git a/driver/linkloader/include/ELFObject.h b/cpu_ref/linkloader/include/ELFObject.h
similarity index 100%
rename from driver/linkloader/include/ELFObject.h
rename to cpu_ref/linkloader/include/ELFObject.h

diff --git a/driver/linkloader/include/ELFReloc.h b/cpu_ref/linkloader/include/ELFReloc.h
similarity index 100%
rename from driver/linkloader/include/ELFReloc.h
rename to cpu_ref/linkloader/include/ELFReloc.h

diff --git a/driver/linkloader/include/ELFSection.h b/cpu_ref/linkloader/include/ELFSection.h
similarity index 100%
rename from driver/linkloader/include/ELFSection.h
rename to cpu_ref/linkloader/include/ELFSection.h

diff --git a/driver/linkloader/include/ELFSectionBits.h b/cpu_ref/linkloader/include/ELFSectionBits.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionBits.h
rename to cpu_ref/linkloader/include/ELFSectionBits.h

diff --git a/driver/linkloader/include/ELFSectionHeader.h b/cpu_ref/linkloader/include/ELFSectionHeader.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionHeader.h
rename to cpu_ref/linkloader/include/ELFSectionHeader.h

diff --git a/driver/linkloader/include/ELFSectionHeaderTable.h b/cpu_ref/linkloader/include/ELFSectionHeaderTable.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionHeaderTable.h
rename to cpu_ref/linkloader/include/ELFSectionHeaderTable.h

diff --git a/driver/linkloader/include/ELFSectionNoBits.h b/cpu_ref/linkloader/include/ELFSectionNoBits.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionNoBits.h
rename to cpu_ref/linkloader/include/ELFSectionNoBits.h

diff --git a/driver/linkloader/include/ELFSectionProgBits.h b/cpu_ref/linkloader/include/ELFSectionProgBits.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionProgBits.h
rename to cpu_ref/linkloader/include/ELFSectionProgBits.h

diff --git a/driver/linkloader/include/ELFSectionRelTable.h b/cpu_ref/linkloader/include/ELFSectionRelTable.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionRelTable.h
rename to cpu_ref/linkloader/include/ELFSectionRelTable.h

diff --git a/driver/linkloader/include/ELFSectionStrTab.h b/cpu_ref/linkloader/include/ELFSectionStrTab.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionStrTab.h
rename to cpu_ref/linkloader/include/ELFSectionStrTab.h

diff --git a/driver/linkloader/include/ELFSectionSymTab.h b/cpu_ref/linkloader/include/ELFSectionSymTab.h
similarity index 100%
rename from driver/linkloader/include/ELFSectionSymTab.h
rename to cpu_ref/linkloader/include/ELFSectionSymTab.h

diff --git a/driver/linkloader/include/ELFSymbol.h b/cpu_ref/linkloader/include/ELFSymbol.h
similarity index 100%
rename from driver/linkloader/include/ELFSymbol.h
rename to cpu_ref/linkloader/include/ELFSymbol.h

diff --git a/driver/linkloader/include/ELFTypes.h b/cpu_ref/linkloader/include/ELFTypes.h
similarity index 100%
rename from driver/linkloader/include/ELFTypes.h
rename to cpu_ref/linkloader/include/ELFTypes.h

diff --git a/driver/linkloader/include/GOT.h b/cpu_ref/linkloader/include/GOT.h
similarity index 100%
rename from driver/linkloader/include/GOT.h
rename to cpu_ref/linkloader/include/GOT.h

diff --git a/driver/linkloader/include/MemChunk.h b/cpu_ref/linkloader/include/MemChunk.h
similarity index 100%
rename from driver/linkloader/include/MemChunk.h
rename to cpu_ref/linkloader/include/MemChunk.h

diff --git a/driver/linkloader/include/StubLayout.h b/cpu_ref/linkloader/include/StubLayout.h
similarity index 100%
rename from driver/linkloader/include/StubLayout.h
rename to cpu_ref/linkloader/include/StubLayout.h

diff --git a/driver/linkloader/include/impl/ELFHeader.hxx b/cpu_ref/linkloader/include/impl/ELFHeader.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFHeader.hxx
rename to cpu_ref/linkloader/include/impl/ELFHeader.hxx

diff --git a/driver/linkloader/include/impl/ELFObject.hxx b/cpu_ref/linkloader/include/impl/ELFObject.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFObject.hxx
rename to cpu_ref/linkloader/include/impl/ELFObject.hxx

diff --git a/driver/linkloader/include/impl/ELFReloc.hxx b/cpu_ref/linkloader/include/impl/ELFReloc.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFReloc.hxx
rename to cpu_ref/linkloader/include/impl/ELFReloc.hxx

diff --git a/driver/linkloader/include/impl/ELFSection.hxx b/cpu_ref/linkloader/include/impl/ELFSection.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSection.hxx
rename to cpu_ref/linkloader/include/impl/ELFSection.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionBits.hxx b/cpu_ref/linkloader/include/impl/ELFSectionBits.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionBits.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionBits.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionHeader.hxx b/cpu_ref/linkloader/include/impl/ELFSectionHeader.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionHeader.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionHeader.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionHeaderTable.hxx b/cpu_ref/linkloader/include/impl/ELFSectionHeaderTable.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionHeaderTable.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionHeaderTable.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionNoBits.hxx b/cpu_ref/linkloader/include/impl/ELFSectionNoBits.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionNoBits.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionNoBits.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionProgBits.hxx b/cpu_ref/linkloader/include/impl/ELFSectionProgBits.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionProgBits.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionProgBits.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionRelTable.hxx b/cpu_ref/linkloader/include/impl/ELFSectionRelTable.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionRelTable.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionRelTable.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionStrTab.hxx b/cpu_ref/linkloader/include/impl/ELFSectionStrTab.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionStrTab.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionStrTab.hxx

diff --git a/driver/linkloader/include/impl/ELFSectionSymTab.hxx b/cpu_ref/linkloader/include/impl/ELFSectionSymTab.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSectionSymTab.hxx
rename to cpu_ref/linkloader/include/impl/ELFSectionSymTab.hxx

diff --git a/driver/linkloader/include/impl/ELFSymbol.hxx b/cpu_ref/linkloader/include/impl/ELFSymbol.hxx
similarity index 100%
rename from driver/linkloader/include/impl/ELFSymbol.hxx
rename to cpu_ref/linkloader/include/impl/ELFSymbol.hxx

diff --git a/driver/linkloader/lib/ELFHeader.cpp b/cpu_ref/linkloader/lib/ELFHeader.cpp
similarity index 100%
rename from driver/linkloader/lib/ELFHeader.cpp
rename to cpu_ref/linkloader/lib/ELFHeader.cpp

diff --git a/driver/linkloader/lib/ELFSectionHeader.cpp b/cpu_ref/linkloader/lib/ELFSectionHeader.cpp
similarity index 100%
rename from driver/linkloader/lib/ELFSectionHeader.cpp
rename to cpu_ref/linkloader/lib/ELFSectionHeader.cpp

diff --git a/driver/linkloader/lib/ELFSymbol.cpp b/cpu_ref/linkloader/lib/ELFSymbol.cpp
similarity index 100%
rename from driver/linkloader/lib/ELFSymbol.cpp
rename to cpu_ref/linkloader/lib/ELFSymbol.cpp

diff --git a/driver/linkloader/lib/ELFTypes.cpp b/cpu_ref/linkloader/lib/ELFTypes.cpp
similarity index 100%
rename from driver/linkloader/lib/ELFTypes.cpp
rename to cpu_ref/linkloader/lib/ELFTypes.cpp

diff --git a/driver/linkloader/lib/GOT.cpp b/cpu_ref/linkloader/lib/GOT.cpp
similarity index 100%
rename from driver/linkloader/lib/GOT.cpp
rename to cpu_ref/linkloader/lib/GOT.cpp

diff --git a/driver/linkloader/lib/MemChunk.cpp b/cpu_ref/linkloader/lib/MemChunk.cpp
similarity index 100%
rename from driver/linkloader/lib/MemChunk.cpp
rename to cpu_ref/linkloader/lib/MemChunk.cpp

diff --git a/driver/linkloader/lib/StubLayout.cpp b/cpu_ref/linkloader/lib/StubLayout.cpp
similarity index 100%
rename from driver/linkloader/lib/StubLayout.cpp
rename to cpu_ref/linkloader/lib/StubLayout.cpp

diff --git a/driver/linkloader/main.cpp b/cpu_ref/linkloader/main.cpp
similarity index 100%
rename from driver/linkloader/main.cpp
rename to cpu_ref/linkloader/main.cpp

diff --git a/driver/linkloader/utils/flush_cpu_cache.h b/cpu_ref/linkloader/utils/flush_cpu_cache.h
similarity index 100%
rename from driver/linkloader/utils/flush_cpu_cache.h
rename to cpu_ref/linkloader/utils/flush_cpu_cache.h

diff --git a/driver/linkloader/utils/helper.cpp b/cpu_ref/linkloader/utils/helper.cpp
similarity index 100%
rename from driver/linkloader/utils/helper.cpp
rename to cpu_ref/linkloader/utils/helper.cpp

diff --git a/driver/linkloader/utils/helper.h b/cpu_ref/linkloader/utils/helper.h
similarity index 100%
rename from driver/linkloader/utils/helper.h
rename to cpu_ref/linkloader/utils/helper.h

diff --git a/driver/linkloader/utils/raw_ostream.cpp b/cpu_ref/linkloader/utils/raw_ostream.cpp
similarity index 100%
rename from driver/linkloader/utils/raw_ostream.cpp
rename to cpu_ref/linkloader/utils/raw_ostream.cpp

diff --git a/driver/linkloader/utils/raw_ostream.h b/cpu_ref/linkloader/utils/raw_ostream.h
similarity index 100%
rename from driver/linkloader/utils/raw_ostream.h
rename to cpu_ref/linkloader/utils/raw_ostream.h

diff --git a/driver/linkloader/utils/rsl_assert.cpp b/cpu_ref/linkloader/utils/rsl_assert.cpp
similarity index 100%
rename from driver/linkloader/utils/rsl_assert.cpp
rename to cpu_ref/linkloader/utils/rsl_assert.cpp

diff --git a/driver/linkloader/utils/rsl_assert.h b/cpu_ref/linkloader/utils/rsl_assert.h
similarity index 100%
rename from driver/linkloader/utils/rsl_assert.h
rename to cpu_ref/linkloader/utils/rsl_assert.h

diff --git a/driver/linkloader/utils/serialize.h b/cpu_ref/linkloader/utils/serialize.h
similarity index 100%
rename from driver/linkloader/utils/serialize.h
rename to cpu_ref/linkloader/utils/serialize.h

diff --git a/driver/linkloader/utils/traits.h b/cpu_ref/linkloader/utils/traits.h
similarity index 100%
rename from driver/linkloader/utils/traits.h
rename to cpu_ref/linkloader/utils/traits.h