woods: :( gralloc_extra -_-

iykex · May 28, 2018 · 6388212 · 6388212
1 parent 08ee282
commit 6388212
Show file tree

Hide file tree

Showing 19 changed files with 213 additions and 1,167 deletions.
diff --git a/libgralloc_extra/Android.mk b/libgralloc_extra/Android.mk
@@ -1,96 +1,45 @@
 LOCAL_PATH := $(call my-dir)
 
-###############################################################################
-# Build Gralloc Extra System library
-# #
-#
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libgralloc_extra_sys
-
 LOCAL_SRC_FILES := \
-  platform/ge_platform_default.c
-    #ge_operator.cpp \
-    #ge_misc.c \
-
-
-# add platform.c
-#LOCAL_SRC_FILES += $(LOCAL_PATH)/libgralloc_extra/platform/default/platform.c
+	GraphicBufferExtra.cpp \
+	GraphicBufferExtra_hal.cpp
+#	ge.c
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/libgralloc_extra/include
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/libgralloc_extra/include
-
-LOCAL_C_INCLUDES += \
-		system/core/libion/include \
-	  frameworks/native/libs/nativewindow/include \
-	  frameworks/native/libs/nativebase/include \
-		frameworks/native/libs/arect/include
+	device/motorola/woods/libgralloc_extra/include \
+	device/motorola/woods/libgralloc_extra/../include
 
 LOCAL_SHARED_LIBRARIES := \
     libhardware \
     libcutils \
     libutils \
     liblog \
     libion \
-    libged_sys
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := mtk
-
-include $(BUILD_SHARED_LIBRARY)
-
-###############################################################################
-# Build Gralloc Extra Vendor library
-# #
-#
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libgralloc_extra
-
-LOCAL_SRC_FILES := \
-    ge_operator.cpp \
-    ge_misc.c \
-    platform/ge_platform_default.c
-
-# add platform.c
-#LOCAL_SRC_FILES += $(LOCAL_PATH)/libgralloc_extra/platform/default/platform.c
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    #$(ANDROID_BUILD_TOP)/system/core/libion/include
+	libged
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
+	device/motorola/woods/libgralloc_extra/include \
 
-LOCAL_SHARED_LIBRARIES := \
-    libhardware \
-    libcutils \
-    libutils \
-    liblog \
-    libion \
-    libged
+LOCAL_C_INCLUDES += \
+	system/core/libion/include \
+	frameworks/native/libs/nativewindow/include \
+	frameworks/native/libs/nativebase/include \
+	frameworks/native/libs/arect/include
 
-LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE := libgralloc_extra
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := mtk
 
 include $(BUILD_SHARED_LIBRARY)
 
-
-###############################################################################
-# Gralloc Extra Test
-# #
-#
 ifneq ($(TARGET_2ND_ARCH), "")
 
 include $(CLEAR_VARS)
 
 test-sanity-gralloc_extra: lpath := $(LOCAL_PATH)
 test-sanity-gralloc_extra: o32 := $(TARGET_OUT)/vendor/lib/libgralloc_extra.so
-test-sanity-gralloc_extra: $(TARGET_OUT)/vendor/lib/libgralloc_extra.so $(TARGET_OUT)/vendor/lib64/libgralloc_extra.so
+test-sanity-gralloc_extra: $(TARGET_OUT)/vendor/lib/libgralloc_extra.so
 	@\
 	s32=`gdb -batch $(o32) -ex "p _ge_check_size"`; \
 	s64=`gdb -batch $(o64) -ex "p _ge_check_size"`; \

diff --git a/libgralloc_extra/NOTICE b/libgralloc_extra/NOTICE
@@ -1,9 +1,9 @@
- *      (C) COPYRIGHT 2018 ARM Limited, ALL RIGHTS RESERVED:
+ *      (C) COPYRIGHT 2014 ARM Limited, ALL RIGHTS RESERVED:
 
 
 
 /*
-* Copyright (C) 2011-2018 MediaTek Inc.
+* Copyright (C) 2011-2014 MediaTek Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,3 +17,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
+
+
diff --git a/libgralloc_extra/ge_config.h b/libgralloc_extra/ge_config.h
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2011-201 MediaTek Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #ifndef GE_INCLUDE_CONFIG
 #error "gralloc_extra_config only can be included by implementation!"
 #endif
@@ -26,9 +10,6 @@
 	GE_STRUCT(ge_sf_info_t) \
 	GE_STRUCT(ge_sec_hwc_t) \
 	GE_STRUCT(ge_hdr_info_t) \
-	GE_STRUCT(ge_video_info_t) \
-	GE_STRUCT(ge_hwc_info_t) \
-	GE_STRUCT(ge_timestamp_info_t) \
 
 #undef GE_STRUCT
 #define GE_STRUCT(x) sizeof(x),