Merge "Revert "move android_ids into bionic""

libc/Android.bp

@@ -1193,13 +1193,6 @@ cc_library_static {
     name: "libc_bionic",
 }
 
-genrule {
-    name: "generated_android_ids",
-    out: [ "generated_android_ids.h" ],
-    tool_files: [ "fs_config_generator.py" ],
-    cmd: "$(location fs_config_generator.py) aidarray system/core/include/private/android_filesystem_config.h > $(out)",
-}
-
 // ========================================================
 // libc_bionic_ndk.a- The portions of libc_bionic that can
 // be safely used in libc_ndk.a (no troublesome global data
@@ -1388,7 +1381,6 @@ cc_library_static {
     local_include_dirs: ["stdio"],
     include_dirs: ["bionic/libstdc++/include"],
     name: "libc_bionic_ndk",
-    generated_headers: ["generated_android_ids"],
 }
 
 // ========================================================

libc/bionic/grp_pwd.cpp

@@ -43,9 +43,6 @@
 #include "private/libc_logging.h"
 #include "private/ThreadLocalBuffer.h"
 
-// Generated android_ids array
-#include "generated_android_ids.h"
-
 // POSIX seems to envisage an implementation where the <pwd.h> functions are
 // implemented by brute-force searching with getpwent(3), and the <grp.h>
 // functions are implemented similarly with getgrent(3). This means that it's

libc/fs_config_generator.py

@@ -1 +0,0 @@
-../../build/tools/fs_config/fs_config_generator.py

tests/Android.bp

@@ -155,8 +155,6 @@ cc_test_library {
     shared: {
         enabled: false,
     },
-
-    generated_headers: ["generated_android_ids"],
 }
 
 // -----------------------------------------------------------------------------

tests/grp_pwd_test.cpp

@@ -30,9 +30,6 @@
 
 #include <private/android_filesystem_config.h>
 
-// Generated android_ids array
-#include "generated_android_ids.h"
-
 enum uid_type_t {
   TYPE_SYSTEM,
   TYPE_APP