commit 3f6eee9793e4c41c7f4b15a723c777ae67fb1e51
author Elliott Hughes <enh@google.com> Tue Dec 13 23:47:25 2016 +0000
committer Elliott Hughes <enh@google.com> Tue Dec 13 23:47:25 2016 +0000
tree 8dae7fc7d418fdf69d34057f8b80add179eeb351
parent 77cb68d9f2621639ec7f4e1b124ceeee5c80a66a

Revert "Revert "move android_ids into bionic""

This reverts commit 77cb68d9f2621639ec7f4e1b124ceeee5c80a66a.

Change-Id: Ibc9f775c4cd418be90fd8a6f192dd72ca5dff09a

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index a9d302a..0868f6e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -155,6 +155,8 @@
     shared: {
         enabled: false,
     },
+
+    generated_headers: ["generated_android_ids"],
 }
 
 // -----------------------------------------------------------------------------

tests/grp_pwd_test.cpp

diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp
index a684780..a2c31d1 100644
--- a/tests/grp_pwd_test.cpp
+++ b/tests/grp_pwd_test.cpp
@@ -30,6 +30,9 @@
 
 #include <private/android_filesystem_config.h>
 
+// Generated android_ids array
+#include "generated_android_ids.h"
+
 enum uid_type_t {
   TYPE_SYSTEM,
   TYPE_APP