Removing the kuser_helper elf note from building
This change removes the kuser_helper note from building automatically
with any binary but leaves the note.
Also fixes a typo in the note.
Original patch adding the note:
Ib8366e2a0810092b71381d57dee4bdaa56369a24
Bug: 34815073
Test: Manual - Note is no longer added to binaries
Change-Id: Ieb81f9d9127d1f8a522434a31c696d743238e2a5
diff --git a/libc/Android.bp b/libc/Android.bp
index 6c2ca17..6aebb3c 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1868,21 +1868,6 @@
],
}
-cc_object {
- name: "kuser_helper_on",
- local_include_dirs: ["include"],
- arch: {
- arm: {
- srcs: ["arch-arm/bionic/kuser_helper_on.S"],
- },
- },
-
- defaults: [
- "crt_defaults",
- "crt_so_defaults",
- ],
-}
-
// Android.mk:ignore
cc_object {
name: "crtbegin_so1",
@@ -1907,11 +1892,6 @@
"crtbegin_so1",
"crtbrand",
],
- arch: {
- arm: {
- objs: ["kuser_helper_on"],
- },
- },
}
// Android.mk:ignore
@@ -1970,11 +1950,6 @@
"crtbegin_static1",
"crtbrand",
],
- arch: {
- arm: {
- objs: ["kuser_helper_on"],
- },
- },
defaults: ["crt_defaults"],
}
@@ -2021,11 +1996,6 @@
"crtbegin_dynamic1",
"crtbrand",
],
- arch: {
- arm: {
- objs: ["kuser_helper_on"],
- },
- },
defaults: ["crt_defaults"],
}
diff --git a/libc/arch-arm/bionic/kuser_helper_on.S b/libc/arch-arm/bionic/kuser_helper_on.S
index e59d0d5..1e971a8 100644
--- a/libc/arch-arm/bionic/kuser_helper_on.S
+++ b/libc/arch-arm/bionic/kuser_helper_on.S
@@ -25,14 +25,14 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
- .section .note.android.kuser_helper_off,"a",%note
+ .section .note.android.kuser_helper_on,"a",%note
.align 2
- .type abitag, %object
-abitag:
+ .type kuser_helper_on, %object
+kuser_helper_on:
.long 2f-1f /* int32_t namesz */
.long 3f-2f /* int32_t descsz */
.long 3 /* int32_t type */
1: .ascii "Android\0" /* char name[] */
2: .long 1 /* int32_t on */
3:
- .size abitag, .-abitag
+ .size kuser_helper_on, .-kuser_helper_on
