Merge "Removing the kuser_helper elf note from building"

am: e86a8d605b

Change-Id: Ica80892b0973f2370bc10d23aa4279fd76c6ef7e

libc/Android.bp

@@ -1868,21 +1868,6 @@ cc_object {
     ],
 }
 
-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 @@ cc_object {
         "crtbegin_so1",
         "crtbrand",
     ],
-    arch: {
-        arm: {
-            objs: ["kuser_helper_on"],
-        },
-    },
 }
 
 // Android.mk:ignore
@@ -1970,11 +1950,6 @@ cc_object {
         "crtbegin_static1",
         "crtbrand",
     ],
-    arch: {
-        arm: {
-            objs: ["kuser_helper_on"],
-        },
-    },
     defaults: ["crt_defaults"],
 }
 
@@ -2021,11 +1996,6 @@ cc_object {
         "crtbegin_dynamic1",
         "crtbrand",
     ],
-    arch: {
-        arm: {
-            objs: ["kuser_helper_on"],
-        },
-    },
     defaults: ["crt_defaults"],
 }
 

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