Now I have this problem:
I forked android_frameworks_base, android_hardware_msm7k, android_hardware_libhardware from ICS-ACE for complete compiling, but Waceland_ACE merge they wrong and, for example, I have:
Code:
<<<<<<< HEAD
// TODO: move away from static state once 5587429 is fixed.
protected static boolean sPolicyDataEnabled = true;
=======
protected boolean mPolicyDataEnabled = true;
>>>>>>> e3fc4d0ba9f68910f3a9cbecf266073bd28e1f9e
I need to remove:
Code:
<<<<<<< HEAD
// TODO: move away from static state once 5587429 is fixed.
protected static boolean sPolicyDataEnabled = true;
=======
and
Code:
>>>>>>> e3fc4d0ba9f68910f3a9cbecf266073bd28e1f9e
for have only:
Code:
protected boolean mPolicyDataEnabled = true;
It's really boring and laborious.
Now I have to go out, I'll cotinue it later.
The Following 17 Users Say Thank You to For This Useful Post: [ Click to Expand ]
Hey Maclaw..
I cannot help in developing but here I want to cheer you for all your efforts.
3 cheers for Maclaw and his supporters..
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
and Have a happy blasting New Year...!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
Hip Hip Hurray!!!
There are still quite a few of folks who run Gingerbread on their … more
XDA Developers was founded by developers, for developers. It is now a valuable resource for people who want to make the most of their mobile devices, from customizing the look and feel to adding new functionality. Are you a developer?