aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-08-27 10:16:38 -0700
committerXin Li <delphij@google.com>2020-08-27 10:16:38 -0700
commit04f0613527ef6128398a91e54c49be57525c4bc4 (patch)
tree27044bca824087616b2e2c3641c660d5ed082e9f
parentb45616374afe02fc04da21636503d034c9c8c8dc (diff)
parent152923487d674a1236dc55d0b29580a90c7e64be (diff)
downloadwalt-04f0613527ef6128398a91e54c49be57525c4bc4.tar.gz
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507 Merged-In: Id888b6053f6b3c1a473e52a8cf546e8da95c4c1c Change-Id: I65ecefe07f663120b1b088f1380c8443938ec2f1
-rw-r--r--OWNERS1
-rw-r--r--android/WALT/app/src/main/jni/Android.bp1
2 files changed, 2 insertions, 0 deletions
diff --git a/OWNERS b/OWNERS
index 6394dc4..b74e8ca 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,3 +2,4 @@
# Please update this list if you find better candidates.
alehmer@google.com
spfetsch@google.com
+gkasten@google.com
diff --git a/android/WALT/app/src/main/jni/Android.bp b/android/WALT/app/src/main/jni/Android.bp
index a789f4b..cbbaa82 100644
--- a/android/WALT/app/src/main/jni/Android.bp
+++ b/android/WALT/app/src/main/jni/Android.bp
@@ -25,6 +25,7 @@ cc_library_shared {
"-g",
"-DUSE_LIBLOG",
"-Werror",
+ "-Wno-deprecated-declarations",
],
shared_libs: [