commit 7e06476f6daf75946d93972e4187f2d600b51fac
author Olivier Bailly <olivier@google.com> Mon Nov 29 15:13:50 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 29 15:13:50 2010 -0800
tree 1c933f6b1e0367e0270b3f989e07cb15dab10473
parent 9e04fcde67aca1596664e052c37424cbd910da57
parent b93e5812faffd3b6c5fb349072413aace31918d8

Merge "Add missing headers for compilation on x86 targets"

init/init.c

diff --git a/init/init.c b/init/init.c
index cd129c3..7aef387 100755
--- a/init/init.c
+++ b/init/init.c
@@ -243,13 +243,22 @@
 
     /* as requested, set our gid, supplemental gids, and uid */
         if (svc->gid) {
-            setgid(svc->gid);
+            if (setgid(svc->gid) != 0) {
+                ERROR("setgid failed: %s\n", strerror(errno));
+                _exit(127);
+            }
         }
         if (svc->nr_supp_gids) {
-            setgroups(svc->nr_supp_gids, svc->supp_gids);
+            if (setgroups(svc->nr_supp_gids, svc->supp_gids) != 0) {
+                ERROR("setgroups failed: %s\n", strerror(errno));
+                _exit(127);
+            }
         }
         if (svc->uid) {
-            setuid(svc->uid);
+            if (setuid(svc->uid) != 0) {
+                ERROR("setuid failed: %s\n", strerror(errno));
+                _exit(127);
+            }
         }
 
         if (!dynamic_args) {

libpixelflinger/codeflinger/ARMAssembler.cpp

diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index fa9f1ad..4726a08 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -334,7 +334,7 @@
 
 void ARMAssembler::STM(int cc, int dir,
         int Rn, int W, uint32_t reg_list)
-{   //                    FA EA FD ED      IB IA DB DA
+{   //                    ED FD EA FA      IB IA DB DA
     const uint8_t P[8] = { 0, 1, 0, 1,      1, 0, 1, 0 };
     const uint8_t U[8] = { 0, 0, 1, 1,      1, 1, 0, 0 };
     *mPC++ = (cc<<28) | (4<<25) | (uint32_t(P[dir])<<24) |

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 232677c..a6ce529 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -286,7 +286,7 @@
     user shell
     group log
 
-on property:ro.secure=0
+on property:ro.debuggable=1
     start console
 
 # adbd is controlled by the persist.service.adb.enable system property