Revert "move android_ids into bionic"
This reverts commit 1a13db5b2675759316a8529873c5d29831a9ba32.
Change-Id: I7f571b3a9d542694d16fb9cf1131ef9e59d330ea
diff --git a/libc/Android.bp b/libc/Android.bp
index 66bbc71..094ad5c 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1194,13 +1194,6 @@
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
@@ -1389,7 +1382,6 @@
local_include_dirs: ["stdio"],
include_dirs: ["bionic/libstdc++/include"],
name: "libc_bionic_ndk",
- generated_headers: ["generated_android_ids"],
}
// ========================================================
diff --git a/libc/bionic/grp_pwd.cpp b/libc/bionic/grp_pwd.cpp
index b6b5796..332b2b8 100644
--- a/libc/bionic/grp_pwd.cpp
+++ b/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
diff --git a/libc/fs_config_generator.py b/libc/fs_config_generator.py
deleted file mode 120000
index aafb7dc..0000000
--- a/libc/fs_config_generator.py
+++ /dev/null
@@ -1 +0,0 @@
-../../build/tools/fs_config/fs_config_generator.py
\ No newline at end of file
diff --git a/tests/Android.bp b/tests/Android.bp
index 0868f6e..a9d302a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -155,8 +155,6 @@
shared: {
enabled: false,
},
-
- generated_headers: ["generated_android_ids"],
}
// -----------------------------------------------------------------------------
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp
index a2c31d1..a684780 100644
--- a/tests/grp_pwd_test.cpp
+++ b/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