整理

Change-Id: Idb5abe8f7aff24c76063c8382da9598ab1e1f79c
2018-07-03 21:57:09 +08:00
parent 8d86788a46
commit c759bbc07f
951 changed files with 3509 additions and 9 deletions
--- a/other_lib/Android.mk
+++ b/other_lib/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
--- a/jni/application/android-shmem/Android.mk
+++ b/jni/application/android-shmem/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)

 include $(CLEAR_VARS)

-LOCAL_MODULE := libandroid-shmem
+LOCAL_MODULE := android-shmem_xserver

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/libancillary -D_LINUX_IPC_H -DNO_debian_ipc_perm
--- a/jni/application/android-shmem/LICENSE
+++ b/jni/application/android-shmem/LICENSE
--- a/jni/application/android-shmem/README.md
+++ b/jni/application/android-shmem/README.md
--- a/jni/application/android-shmem/ashmem-dev.c
+++ b/jni/application/android-shmem/ashmem-dev.c
--- a/jni/application/android-shmem/build.sh
+++ b/jni/application/android-shmem/build.sh
--- a/jni/application/android-shmem/cutils/ashmem-dev.c
+++ b/jni/application/android-shmem/cutils/ashmem-dev.c
--- a/jni/application/android-shmem/cutils/ashmem.h
+++ b/jni/application/android-shmem/cutils/ashmem.h
--- a/jni/application/android-shmem/exports.txt
+++ b/jni/application/android-shmem/exports.txt
--- a/jni/application/android-shmem/fd_recv.c
+++ b/jni/application/android-shmem/fd_recv.c
--- a/jni/application/android-shmem/fd_send.c
+++ b/jni/application/android-shmem/fd_send.c
--- a/jni/application/android-shmem/libancillary/API
+++ b/jni/application/android-shmem/libancillary/API
--- a/jni/application/android-shmem/libancillary/COPYING
+++ b/jni/application/android-shmem/libancillary/COPYING
--- a/jni/application/android-shmem/libancillary/Makefile
+++ b/jni/application/android-shmem/libancillary/Makefile
--- a/jni/application/android-shmem/libancillary/ancillary.h
+++ b/jni/application/android-shmem/libancillary/ancillary.h
--- a/jni/application/android-shmem/libancillary/fd_recv.c
+++ b/jni/application/android-shmem/libancillary/fd_recv.c
--- a/jni/application/android-shmem/libancillary/fd_send.c
+++ b/jni/application/android-shmem/libancillary/fd_send.c
--- a/jni/application/android-shmem/libancillary/test.c
+++ b/jni/application/android-shmem/libancillary/test.c
--- a/jni/application/android-shmem/linux/ashmem.h
+++ b/jni/application/android-shmem/linux/ashmem.h
--- a/jni/application/android-shmem/shmem.c
+++ b/jni/application/android-shmem/shmem.c
--- a/jni/application/android-shmem/sys/shm.h
+++ b/jni/application/android-shmem/sys/shm.h
--- a/jni/application/android-shmem/test/build.sh
+++ b/jni/application/android-shmem/test/build.sh
--- a/jni/application/android-shmem/test/setCrossEnvironment-armeabi-v7a.sh
+++ b/jni/application/android-shmem/test/setCrossEnvironment-armeabi-v7a.sh
--- a/jni/application/android-shmem/test/test.c
+++ b/jni/application/android-shmem/test/test.c
--- a/other_lib/flac/AUTHORS
+++ b/other_lib/flac/AUTHORS
--- a/other_lib/flac/Android.mk
+++ b/other_lib/flac/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)

 include $(CLEAR_VARS)

-LOCAL_MODULE := flac
+LOCAL_MODULE := flac_xserver

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/src/include $(LOCAL_PATH) $(LOCAL_PATH)/../ogg/include
 LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS
@@ -15,7 +15,7 @@ LOCAL_CPP_EXTENSION := .cpp

 LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.c) $(wildcard $(LOCAL_PATH)/src/*.cpp)))

-LOCAL_STATIC_LIBRARIES := ogg
+LOCAL_STATIC_LIBRARIES := ogg_xserver

 LOCAL_SHARED_LIBRARIES := 

--- a/other_lib/flac/COPYING.FDL
+++ b/other_lib/flac/COPYING.FDL
--- a/other_lib/flac/COPYING.GPL
+++ b/other_lib/flac/COPYING.GPL
--- a/other_lib/flac/COPYING.LGPL
+++ b/other_lib/flac/COPYING.LGPL
--- a/other_lib/flac/COPYING.Xiph
+++ b/other_lib/flac/COPYING.Xiph
--- a/other_lib/flac/README
+++ b/other_lib/flac/README
--- a/other_lib/flac/config.h
+++ b/other_lib/flac/config.h
--- a/other_lib/flac/include/FLAC/all.h
+++ b/other_lib/flac/include/FLAC/all.h
--- a/other_lib/flac/include/FLAC/assert.h
+++ b/other_lib/flac/include/FLAC/assert.h
--- a/other_lib/flac/include/FLAC/callback.h
+++ b/other_lib/flac/include/FLAC/callback.h
--- a/other_lib/flac/include/FLAC/export.h
+++ b/other_lib/flac/include/FLAC/export.h
--- a/other_lib/flac/include/FLAC/format.h
+++ b/other_lib/flac/include/FLAC/format.h
--- a/other_lib/flac/include/FLAC/metadata.h
+++ b/other_lib/flac/include/FLAC/metadata.h
--- a/other_lib/flac/include/FLAC/ordinals.h
+++ b/other_lib/flac/include/FLAC/ordinals.h
--- a/other_lib/flac/include/FLAC/stream_decoder.h
+++ b/other_lib/flac/include/FLAC/stream_decoder.h
--- a/other_lib/flac/include/FLAC/stream_encoder.h
+++ b/other_lib/flac/include/FLAC/stream_encoder.h
--- a/other_lib/flac/src/bitmath.c
+++ b/other_lib/flac/src/bitmath.c
--- a/other_lib/flac/src/bitreader.c
+++ b/other_lib/flac/src/bitreader.c
--- a/other_lib/flac/src/bitwriter.c
+++ b/other_lib/flac/src/bitwriter.c
--- a/other_lib/flac/src/cpu.c
+++ b/other_lib/flac/src/cpu.c
--- a/other_lib/flac/src/crc.c
+++ b/other_lib/flac/src/crc.c
--- a/other_lib/flac/src/fixed.c
+++ b/other_lib/flac/src/fixed.c
--- a/other_lib/flac/src/float.c
+++ b/other_lib/flac/src/float.c
--- a/other_lib/flac/src/format.c
+++ b/other_lib/flac/src/format.c
--- a/other_lib/flac/src/include/private/all.h
+++ b/other_lib/flac/src/include/private/all.h
--- a/other_lib/flac/src/include/private/bitmath.h
+++ b/other_lib/flac/src/include/private/bitmath.h
--- a/other_lib/flac/src/include/private/bitreader.h
+++ b/other_lib/flac/src/include/private/bitreader.h
--- a/other_lib/flac/src/include/private/bitwriter.h
+++ b/other_lib/flac/src/include/private/bitwriter.h
--- a/other_lib/flac/src/include/private/cpu.h
+++ b/other_lib/flac/src/include/private/cpu.h
--- a/other_lib/flac/src/include/private/crc.h
+++ b/other_lib/flac/src/include/private/crc.h
--- a/other_lib/flac/src/include/private/fixed.h
+++ b/other_lib/flac/src/include/private/fixed.h
--- a/other_lib/flac/src/include/private/float.h
+++ b/other_lib/flac/src/include/private/float.h
--- a/other_lib/flac/src/include/private/format.h
+++ b/other_lib/flac/src/include/private/format.h
--- a/other_lib/flac/src/include/private/lpc.h
+++ b/other_lib/flac/src/include/private/lpc.h
--- a/other_lib/flac/src/include/private/md5.h
+++ b/other_lib/flac/src/include/private/md5.h
--- a/other_lib/flac/src/include/private/memory.h
+++ b/other_lib/flac/src/include/private/memory.h
--- a/other_lib/flac/src/include/private/metadata.h
+++ b/other_lib/flac/src/include/private/metadata.h
--- a/other_lib/flac/src/include/private/ogg_decoder_aspect.h
+++ b/other_lib/flac/src/include/private/ogg_decoder_aspect.h
--- a/other_lib/flac/src/include/private/ogg_encoder_aspect.h
+++ b/other_lib/flac/src/include/private/ogg_encoder_aspect.h
--- a/other_lib/flac/src/include/private/ogg_helper.h
+++ b/other_lib/flac/src/include/private/ogg_helper.h
--- a/other_lib/flac/src/include/private/ogg_mapping.h
+++ b/other_lib/flac/src/include/private/ogg_mapping.h
--- a/other_lib/flac/src/include/private/stream_encoder_framing.h
+++ b/other_lib/flac/src/include/private/stream_encoder_framing.h
--- a/other_lib/flac/src/include/private/window.h
+++ b/other_lib/flac/src/include/private/window.h
--- a/other_lib/flac/src/include/protected/all.h
+++ b/other_lib/flac/src/include/protected/all.h
--- a/other_lib/flac/src/include/protected/stream_decoder.h
+++ b/other_lib/flac/src/include/protected/stream_decoder.h
--- a/other_lib/flac/src/include/protected/stream_encoder.h
+++ b/other_lib/flac/src/include/protected/stream_encoder.h
--- a/other_lib/flac/src/include/share/alloc.h
+++ b/other_lib/flac/src/include/share/alloc.h
--- a/other_lib/flac/src/include/share/getopt.h
+++ b/other_lib/flac/src/include/share/getopt.h
--- a/other_lib/flac/src/include/share/grabbag.h
+++ b/other_lib/flac/src/include/share/grabbag.h
--- a/other_lib/flac/src/include/share/grabbag/cuesheet.h
+++ b/other_lib/flac/src/include/share/grabbag/cuesheet.h
--- a/other_lib/flac/src/include/share/grabbag/file.h
+++ b/other_lib/flac/src/include/share/grabbag/file.h
--- a/other_lib/flac/src/include/share/grabbag/picture.h
+++ b/other_lib/flac/src/include/share/grabbag/picture.h
--- a/other_lib/flac/src/include/share/grabbag/replaygain.h
+++ b/other_lib/flac/src/include/share/grabbag/replaygain.h
--- a/other_lib/flac/src/include/share/grabbag/seektable.h
+++ b/other_lib/flac/src/include/share/grabbag/seektable.h
--- a/other_lib/flac/src/include/share/replaygain_analysis.h
+++ b/other_lib/flac/src/include/share/replaygain_analysis.h
--- a/other_lib/flac/src/include/share/replaygain_synthesis.h
+++ b/other_lib/flac/src/include/share/replaygain_synthesis.h
--- a/other_lib/flac/src/include/share/utf8.h
+++ b/other_lib/flac/src/include/share/utf8.h
--- a/other_lib/flac/src/lpc.c
+++ b/other_lib/flac/src/lpc.c
--- a/other_lib/flac/src/md5.c
+++ b/other_lib/flac/src/md5.c
--- a/other_lib/flac/src/memory.c
+++ b/other_lib/flac/src/memory.c
--- a/other_lib/flac/src/metadata_iterators.c
+++ b/other_lib/flac/src/metadata_iterators.c
--- a/other_lib/flac/src/metadata_object.c
+++ b/other_lib/flac/src/metadata_object.c
--- a/other_lib/flac/src/ogg_decoder_aspect.c
+++ b/other_lib/flac/src/ogg_decoder_aspect.c
--- a/other_lib/flac/src/ogg_encoder_aspect.c
+++ b/other_lib/flac/src/ogg_encoder_aspect.c
--- a/other_lib/flac/src/ogg_helper.c
+++ b/other_lib/flac/src/ogg_helper.c
--- a/other_lib/flac/src/ogg_mapping.c
+++ b/other_lib/flac/src/ogg_mapping.c
--- a/other_lib/flac/src/stream_decoder.c
+++ b/other_lib/flac/src/stream_decoder.c
--- a/other_lib/flac/src/stream_encoder.c
+++ b/other_lib/flac/src/stream_encoder.c
--- a/other_lib/flac/src/stream_encoder_framing.c
+++ b/other_lib/flac/src/stream_encoder_framing.c
--- a/other_lib/flac/src/window.c
+++ b/other_lib/flac/src/window.c
--- a/other_lib/freetype/Android.mk
+++ b/other_lib/freetype/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)

 include $(CLEAR_VARS)

-LOCAL_MODULE := libfreetype
+LOCAL_MODULE := freetype_xserver

 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))

--- a/other_lib/freetype/ChangeLog
+++ b/other_lib/freetype/ChangeLog
--- a/other_lib/freetype/ChangeLog.20
+++ b/other_lib/freetype/ChangeLog.20
--- a/other_lib/freetype/ChangeLog.21
+++ b/other_lib/freetype/ChangeLog.21
--- a/other_lib/freetype/ChangeLog.22
+++ b/other_lib/freetype/ChangeLog.22
--- a/Show More
+++ b/Show More