Address comments from code owner.

Mostly to make it compliant to new requirement.

4 files changed, 7 insertions, 42 deletions

diff --git a/Android.mk b/Android.mk
index d2d6d9f..268254e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,7 @@ LOCAL_CFLAGS += $(WAYLAND_CFLAGS)
 # These files are generated, and we must make them a dependency to ensure they
 # are generated before we try to include them.
 LOCAL_ADDITIONAL_DEPENDENCIES += \
-	device/google/cheets2/external/wayland/src/wayland-version.h \
+	src/wayland-version.h \
 
 LOCAL_MODULE := wayland_scanner
 LOCAL_MODULE_TAGS := optional
@@ -57,10 +57,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/src \
-	device/google/cheets2/external/cheets-libffi/$(TARGET_OS)-$(TARGET_ARCH) \
 
 LOCAL_STATIC_LIBRARIES := \
-	cheets-libffi \
+	libffi \
 
 LOCAL_CFLAGS += $(WAYLAND_CFLAGS)
 
@@ -69,11 +68,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
 
-# These files are generated, and we must make them a dependency to ensure they
-# are generated before we try to include them.
-LOCAL_ADDITIONAL_DEPENDENCIES += \
-	device/google/cheets2/external/cheets-libffi/include/ffi.h \
-
 # Export a list of all included protocols for convenience.
 ALL_MODULES.$(LOCAL_MODULE).PROTOCOLS := \
 	$(LOCAL_PATH)/protocol/wayland.xml \
diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_MIT
+++ /dev/null
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index eb25a4e..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright © 2008-2012 Kristian Høgsberg
-Copyright © 2010-2012 Intel Corporation
-Copyright © 2011 Benjamin Franzke
-Copyright © 2012 Collabora, Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
----
-
-The above is the version of the MIT "Expat" License used by X.org:
-
-    http://cgit.freedesktop.org/xorg/xserver/tree/COPYING
diff --git a/README.cheets.md b/README.android.md
index ab9cbb4..c7bd22b 100644
--- a/README.cheets.md
+++ b/README.android.md
@@ -4,12 +4,12 @@
 
 http://cgit.freedesktop.org/wayland/wayland/
 
-## Files added for use in cheets:
+## Files added for use in Android:
 
 - `./Android.mk`
-- `./MODULE_LICENSE_MIT`
-- `./NOTICE (copy of ./COPYING)`
-- `./README.cheets.md`
+- `./METADATA`
+- `./LICENSE (copy of ./COPYING)`
+- `./README.android.md`
 - `./config.h`
 - `.gitignore`
 
@@ -27,4 +27,4 @@ and should not be checked in.
 
 ### From `src/wayland-version.h.in`
 
-- `src/wayland-version.h`
\ No newline at end of file
+- `src/wayland-version.h`