Merge pull request #186 from gkasten/android

Add and update files from Android downstream branch to more closely m…

5 files changed, 10 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f316df9..c3a3dca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,9 @@ cc_library {
     },
 
     system_shared_libs: ["libc", "libdl"],
+    vndk: {
+        enabled: true,
+    },
 }
 
 cc_binary {
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD
diff --git a/NOTICE b/NOTICE
index fea2b45..5debd99 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,5 @@
 Copyright 2011, The Android Open Source Project
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
     * Redistributions of source code must retain the above copyright
@@ -9,6 +10,7 @@ modification, are permitted provided that the following conditions are met:
     * Neither the name of The Android Open Source Project nor the names of
       its contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY The Android Open Source Project ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..e1e3676
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+dvdli@google.com
+gkasten@google.com