Snap for 4489599 from a107f04d22d35fb0ebf5d7b5f8463023b419f7b6 to pi-release

Change-Id: Ibe0a03cdca090433065ef4ca51ad3c3724339b21

3 files changed, 51 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 0d30d22..37da003 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,13 @@ cc_defaults {
     ],
 }
 
+filegroup {
+    name: "wayland_core_protocol",
+    srcs: [
+        "protocol/wayland.xml",
+    ],
+}
+
 // Generate wayland-version.h
 genrule {
     name: "wayland_version_header",
@@ -46,30 +53,20 @@ cc_binary_host {
     generated_headers: ["wayland_version_header"],
 }
 
-// Copy XML protocols to generated source folders
-wayland_protocol = ["protocol/wayland.xml"]
+// Generate protocol source files used by both client and server
 genrule {
-    name: "wayland_protocols",
-    cmd: "cp $(in) $(genDir)",
-    srcs: wayland_protocol,
-    out: ["wayland.xml"],
-    tool_files: ["."],
-}
-
-// Generate protocol source files
-genrule {
-    name: "wayland_protocol_sources",
+    name: "wayland_core_protocol_sources",
     cmd: "$(location wayland_scanner) code < $(in) > $(out)",
-    srcs: [":wayland_protocols"],
+    srcs: [":wayland_core_protocol"],
     out: ["wayland-protocol.c"],
     tools: ["wayland_scanner"],
 }
 
-// Generate protocol header files
+// Generate protocol header files used by the client
 genrule {
-    name: "wayland_protocol_headers",
+    name: "wayland_core_client_protocol_headers",
     cmd: "$(location wayland_scanner) client-header < $(in) > $(out)",
-    srcs: [":wayland_protocols"],
+    srcs: [":wayland_core_protocol"],
     out: ["wayland-client-protocol.h"],
     tools: ["wayland_scanner"],
 }
@@ -85,10 +82,16 @@ cc_library_static {
        "src/wayland-util.c",
     ],
     cflags: ["-Wall", "-Werror"],
-    generated_sources: ["wayland_protocol_sources"],
+    generated_sources: ["wayland_core_protocol_sources"],
     static_libs: ["libffi"],
     local_include_dirs: ["src"],
-    generated_headers: ["wayland_version_header", "wayland_protocol_headers"],
+    generated_headers: [
+        "wayland_version_header",
+        "wayland_core_client_protocol_headers"
+    ],
     export_include_dirs: ["src"],
-    export_generated_headers: ["wayland_version_header", "wayland_protocol_headers"],
+    export_generated_headers: [
+        "wayland_version_header",
+        "wayland_core_client_protocol_headers"
+    ],
 }
diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_MIT
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..eb25a4e
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,29 @@
+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