0002 should be applied on top of the 0001. I don't have conflict on my
tree. But anyway, I will combine them later.
For now, don't apply 0002 patch. Without it you should be fine for
now.  
On Sun, 2009-05-31 at 18:33 -0700, GrainWang wrote:
> HI YiSun:
>      The new patches confilt too. 0001*.patch and 0002*.patch try to
> patch the same KeyInputQue.java and WindowManagerService.java, See the
> log below
> r...@ubuntu:/home/cupcake_new/frameworks/base# git apply 0001-1.-fixed-
> crash-caused-by-wrong-preload-class.patch
> 0001-1.-fixed-crash-caused-by-wrong-preload-class.patch:2427: trailing
> whitespace.
>                                       (di, di.mDownTime, curTime,
> 0001-1.-fixed-crash-caused-by-wrong-preload-class.patch:2429: trailing
> whitespace.
>                                        ((ev.flags &
> 0001-1.-fixed-crash-caused-by-wrong-preload-class.patch:2430: trailing
> whitespace.
>  
> WindowManagerPolicy.FLAG_WOKE_HERE)
> 0001-1.-fixed-crash-caused-by-wrong-preload-class.patch:2441: trailing
> whitespace.
>                                  ((classes&RawInputEvent.CLASS_MOUSE) !
> = 0))) {
> 0001-1.-fixed-crash-caused-by-wrong-preload-class.patch:2464: trailing
> whitespace.
>                                 if (false)
> error: patch failed: services/java/com/android/server/
> KeyInputQueue.java:278
> error: services/java/com/android/server/KeyInputQueue.java: patch does
> not apply
> r...@ubuntu:/home/cupcake_new/frameworks/base# pwd
> /home/cupcake_new/frameworks/base
> r...@ubuntu:/home/cupcake_new/frameworks/base# cp /home/patch_new/0002-
> fixed-screen-flicking-caused-by-wrong-mouse-location.patch .
> r...@ubuntu:/home/cupcake_new/frameworks/base# git apply 0002-fixed-
> screen-flicking-caused-by-wrong-mouse-location.patch
> 0002-fixed-screen-flicking-caused-by-wrong-mouse-location.patch:112:
> trailing whitespace.
>  
> RawInputEvent.CLASS_TOUCHSCREEN,
> error: patch failed: services/java/com/android/server/
> KeyInputQueue.java:41
> error: services/java/com/android/server/KeyInputQueue.java: patch does
> not apply
> error: patch failed: services/java/com/android/server/
> WindowManagerService.java:4578
> error: services/java/com/android/server/WindowManagerService.java:
> patch does not apply
> 
> 
>  It seemed that the path is not correct.I'll try on mysite. Thanks!
>      preloaded-classes.x86                              | 1156 ++++++++
> +++++++++++
>  .../java/com/android/server/KeyInputQueue.java     |   45 +-
>  .../com/android/server/WindowManagerService.java   |  120 ++-
> 
> On 5月31日, 下午12时00分, Yi Sun <beyo...@gmail.com> wrote:
> > Ok,I think you broke something when you apply the patches.
> > Could u create a new tree and apply the new patches I loaded to the  
> > project page?
> > Just use go to each project dir and apply the patch by using git apply
> >
> > On May 30, 2009, at 7:48 PM,
> >
> >
> >
> > GrainWang <wlc...@yahoo.com.cn> wrote:
> >
> > > HI YiSun:
> > >   The same result when do not using step7,also are the steps "How to
> > > build and install image for EeePC701" also the have-to-steps? I
> > > modifid the all the .mk files and init.rc after appling the patch,but
> > > I'm confused by this statement "compile kernel by disable VESA
> > > framebuffer and enable follow features as module atl2.ko
> > > cfbcopyarea.ko cfbimgblt.ko font.ko i915.ko bitblit.ko cfbfillrect.ko
> > > drm.ko fbcon.ko i2c-algo-bit.ko intelfb.ko softcursor.ko ", I used the
> > > "make menuconfig" to disabled the "VESA framebuffer", but I don't know
> > > how to enable the   .ko files? And how to build the kernels.
> > >     Thanks!
> >
> > > On 5月31日, 上午9时23分, Yi Sun <beyo...@gmail.com> wrote:
> > >> No need for step 7
> > >> BTW, I have fixed the init.rc patch.
> >
> > >> On May 30, 2009, at 5:48 PM, GrainWang <wlc...@yahoo.com.cn> wrote:
> >
> > >>> HI YiSun:
> > >>>     I did every thing that followed the guides,my steps are:
> > >>>     1.repo init -u git://android.git.kernel.org/platform/
> > >>> manifest.git
> > >>> -b cupcake
> > >>>      2. repo sync
> > >>>      3. cd .repo
> > >>>      4.create local_manifest.xml file with contents exatly the same
> > >>> as descripted inhttp://code.google.com/p/patch-hosting-for-android-
> > >>> x86-support/wiki/B...
> > >>>     5.cd ..
> > >>>     6.repo sync
> > >>>      7. . build/envsetup
> > >>>     8.TARGET_ARCH=x86 TARGET_PRODUCT=eee_701 DISABLE_DEXPREOPT=true
> > >>> make -j4 installer_img
> >
> > >>>     Thanks in advance!
> >
> > >>> On 5月27日, 下午10时32分, Yi Sun <beyo...@gmail.com> wrote:
> > >>>> Could you tell me how did you created your tree? It seems that your
> > >>>> toolchain is incorrect. I think
> >
> > >>>> On Wed, 2009-05-27 at 01:27 -0700, GrainWang wrote:
> > >>>>> HI YiSun:
> > >>>>>      After roll back and re-apply all the patches, it seemed  
> > >>>>> that my
> > >>>>> configurations are right,and compling the x86 branch now ,but  
> > >>>>> there
> > >>>>> are still other errors;
> > >>>>> prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/
> > >>>>> i686-
> > >>>>> unknown-linux-gnu-gcc -m32 -o out/target/product/eee_701/obj/lib/
> > >>>>> crtbegin_static.o -c bionic/libc/arch-x86/bionic/crtbegin_static.S
> > >>>>> i686-unknown-linux-gnu-gcc: error trying to exec 'cc1': execvp: No
> > >>>>> such file or directory
> > >>>>> make: *** [out/target/product/eee_701/obj/lib/crtbegin_static.o]
> > >>>>> Error
> > >>>>> 1
> > >>>>> make: *** Waiting for unfinished jobs....
> > >>>>> prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/
> > >>>>> i686-
> > >>>>> unknown-linux-gnu-gcc -m32 -o out/target/product/eee_701/obj/lib/
> > >>>>> crtbegin_so.o -c bionic/libc/arch-x86/bionic/crtbegin_so.S
> > >>>>> i686-unknown-linux-gnu-gcc: error trying to exec 'cc1': execvp: No
> > >>>>> such file or directory
> > >>>>> make: *** [out/target/product/eee_701/obj/lib/crtbegin_so.o]  
> > >>>>> Error 1
> > >>>>>      It semed that I have no compliers for assembly code. my  
> > >>>>> host pc
> > >>>>> is ubuntu8.04, gcc version is 4.2.4.
> > >>>>>      Thanks!
> >
> > >>>>> On 5月27日, 下午12时19分, Yi Sun <beyo...@gmail.com> wrote:
> > >>>>>> Ya,both patches are needed.But they have common parts and you
> > >>>>>> will see
> > >>>>>> errors when you apply both patches.
> > >>>>>> The way to solve the error is to rollback the init.rc after you
> > >>>>>> apply
> > >>>>>> the boot_able_img patch and the apply the power patch
> > >>>>>> Sorry for the inconvenience. It is on my to be fixed list
> >
> > >>>>>> On May 26, 2009, at 8:15 PM, GrainWang <wlc...@yahoo.com.cn>  
> > >>>>>> wrote:
> >
> > >>>>>>> HI YiSun:
> > >>>>>>>     The auto apply patch method is too complicated,and with your
> > >>>>>>> help, I succesfully apply all the patches manually except  
> > >>>>>>> 0001-1.-
> > >>>>>>> enabled-power-mgt.patch, is this a out-of-day patch,I have seen
> > >>>>>>> that
> > >>>>>>> both this patch and boot_able_img_v2.patch try to apply patch to
> > >>>>>>> the
> > >>>>>>> init.rc in asus/eee_701 file. Am i right? If not,how to use the
> > >>>>>>> two
> > >>>>>>> patches to the same object? Thanks!
> >
> > >>>>>>> On 5月27日, 上午12时12分, Yi Sun <beyo...@gmail.com
> > >>>>>>> > wrote:
> > >>>>>>>> You try to apply the patches in the wrong directory. Look into
> > >>>>>>>> the
> > >>>>>>>> patch
> > >>>>>>>> and find out where you can run the patch.
> > >>>>>>>> Yi
> >
> > >>>>>>>> On Tue, 2009-05-26 at 00:49 -0700, GrainWang wrote:
> > >>>>>>>>> HI YiSun:
> > >>>>>>>>>      Thanks for your great help.
> > >>>>>>>>>      When appling the patches, have the following issue. See  
> > >>>>>>>>> the
> > >>>>>>>>> message below:
> >
> > >>>>>>>>> |>From f4a2e330101cce7ee2e13a6b0a82c24f93923130 Mon Sep 17
> > >>>>>>>>> 00:00:00
> > >>>>>>>>> 2001
> > >>>>>>>>> |From: Yi Sun <beyo...@gmail.com>
> > >>>>>>>>> |Date: Fri, 1 May 2009 17:46:54 -0700
> > >>>>>>>>> |Subject: [PATCH] 1. added mouse cursor
> > >>>>>>>>> |
> > >>>>>>>>> |---
> > >>>>>>>>> | core/java/android/view/RawInputEvent.java          |    3 +-
> > >>>>>>>>> | include/ui/EventHub.h                              |    3 +-
> > >>>>>>>>> | libs/ui/EventHub.cpp                               |    4 +
> > >>>>>>>>> | .../java/com/android/server/KeyInputQueue.java     |   45 +
> > >>>>>>>>> ++
> > >>>>>>>>> ++---
> > >>>>>>>>> | .../com/android/server/WindowManagerService.java   |  120 +
> > >>>>>>>>> ++
> > >>>>>>>>> ++++
> > >>>>>>>>> ++++
> > >>>>>>>>> +++++++--
> > >>>>>>>>> | 5 files changed, 150 insertions(+), 25 deletions(-)
> > >>>>>>>>> |
> > >>>>>>>>> |diff --git a/core/java/android/view/RawInputEvent.java b/
> > >>>>>>>>> core/
> > >>>>>>>>> java/
> > >>>>>>>>> android/view/RawInputEvent.java
> > >>>>>>>>> |index 30da83e..4d9a11a 100644
> > >>>>>>>>> |--- a/core/java/android/view/RawInputEvent.java
> > >>>>>>>>> |+++ b/core/java/android/view/RawInputEvent.java
> > >>>>>>>>> --------------------------
> > >>>>>>>>> File to patch: core/java/android/view/RawInputEvent.java
> > >>>>>>>>> core/java/android/view/RawInputEvent.java: No such file or
> > >>>>>>>>> directory
> > >>>>>>>>> Skip this patch? [y] n
> > >>>>>>>>> : No such file or directory
> > >>>>>>>>> Skip this patch? [y] n
> > >>>>>>>>> File to patch: core/java/android/view/RawInputEvent.java
> > >>>>>>>>> core/java/android/view/RawInputEvent.java: No such file or
> > >>>>>>>>> directory
> > >>>>>>>>> Skip this patch? [y]
> >
> > >>>>>>>>>  Why I'm wrong, I created a script file "bash_patch"with the
> > >>>>>>>>> content,
> > >>>>>>>>>    for patch in `pwd`/*patch ; do
> > >>>>>>>>> project=`awk '/^project /{print $2}' $patch`
> > >>>>>>>>> (cd $project && patch -p1 < $patch)
> > >>>>>>>>> done
> >
> > >>>>>>>>>  and cd /home/cupcake/framework/base
> > >>>>>>>>>        mkdir patches
> > >>>>>>>>>        cp -rf somepath/*.patch patches
> > >>>>>>>>>        cp -rf somepath/bash_path patches
> > >>>>>>>>>        ./bash_patch
> >
> > >>>>>>>>> On 5月26日, 下午2时35分, Yi Sun <beyo...@gmail.c
> > >>>>>>>>> om> wrote:
> > >>>>>>>>>> On Mon, 2009-05-25 at 23:22 -0700, GrainWang wrote:
> > >>>>>>>>>>> HI YiSun:
> > >>>>>>>>>>>     Thanks for your efficent help. I have breifly tried the
> > >>>>>>>>>>> website,and corresponding method for about 2days. Now have  
> > >>>>>>>>>>> the
> > >>>>>>>>>>> following issues:
> > >>>>>>>>>>>      1. As I know,"cupcake" is a float branch,and "eee701"
> > >>>>>>>>>>> project is
> > >>>>>>>>>>> not included in"cupcake", and it seemed that "eee701"
> > >>>>>>>>>>> project is
> > >>>>>>>>>>> rarely updated,and "cupcake" are always changing,so could  
> > >>>>>>>>>>> they
> > >>>>>>>>>>> match
> > >>>>>>>>>>> now?
> >
> > >>>>>>>>>> The eee701 project only has some makefile changes to make
> > >>>>>>>>>> Android
> > >>>>>>>>>> to
> > >>>>>>>>>> build for x86 target. There are not much of eeepc specific
> > >>>>>>>>>> things. So,
> > >>>>>>>>>> as long as you make your make file correct, you should be
> > >>>>>>>>>> able to
> > >>>>>>>>>> use
> > >>>>>>>>>> most of the code from standard Android release>      2. Can I
> > >>>>>>>>>> use
> > >>>>>>>>>> "eee701" project to use with"master branch"?
> >
> > >>>>>>>>>> Yes, there is one as matter fact.>      3. I started
> > >>>>>>>>>> downloading
> > >>>>>>>>>> cupcake on 2009,05,21,finished on
> > >>>>>>>>>>> 2009,05,25,and when checking out the eee701 project,the repo
> > >>>>>>>>>>> sync
> > >>>>>>>>>>> found cupcake  changed,and downloaded the changed part, when
> > >>>>>>>>>>> building
> > >>>>>>>>>>> using "TARGET_ARCH=x86 TARGET_PRODUCT=eee_701
> > >>>>>>>>>>> DISABLE_DEXPREOPT=true
> > >>>>>>>>>>> make -j4 installer_img", found that "Please rename "vendor/
> > >>>>>>>>>>> asus/
> > >>>>>>>>>>> eee_701/Android.mk" to "vendor/asus/eee_701/
> > >>>>>>>>>>> AndroidBoard.mk",
> > >>>>>>>>>>> and did
> > >>>>>>>>>>> as guided, found that 'com.google.android.maps error"(I  
> > >>>>>>>>>>> don't
> > >>>>>>>>>>> rember
> > >>>>>>>>>>> this error information clearly),modified the
> > >>>>>>>>>>> "generic_with_google.mk"
> > >>>>>>>>>>> and it passed,but the compilation process always show
> > >>>>>>>>>>> something
> > >>>>>>>>>>> like
> > >>>>>>>>>>> 'arm",and when finished,I can't find the correpoding image
> > >>>>>>>>>>> file.
> >
> > >>>>>>>>>> Check out/target/product directory to see if you have an  
> > >>>>>>>>>> eee701
> > >>>>>>>>>> directory there. I'm updating my tree and will try it out as
> > >>>>>>>>>> well.>      4. I'm sorry that I can't understand the apply
> > >>>>>>>>>> patches part, I
> > >>>>>>>>>>> checked this part,mostly bug related, so I did not aplly the
> > >>>>>>>>>>> patches,
> > >>>>>>>>>>> will this cause that the packages built can't be loading and
> > >>>>>>>>>>> demo the
> > >>>>>>>>>>> basic funcions?
> >
> > >>>>>>>>>> Yes, you have to apply all these patches. Otherwise, I don't
> > >>>>>>>>>> think you
> > >>>>>>>>>> can even build your tree.
> >
> > >>>>>>>>>>>      Thanks again!
> >
> > >>>>>>>>>>> On 5月26日, 上午11时55分, Yi Sun <beyo...@gmail.c
> > >>>>>>>>>>> om> wrote:
> > >>>>>>>>>>>> On Tue, 2009-05-26 at 11:12 +0800, zqqa zqqa wrote:
> > >>>>>>>>>>>>> 2.       Is the “asus eee701” project in  
> > >>>>>>>>>>>>> "cupcake" only
> >
> > ...
> >
> > 阅读更多 »- 隐藏被引用文字 -
> >
> > - 显示引用的文字 -
> > 


--~--~---------~--~----~------------~-------~--~----~
unsubscribe: android-porting+unsubscr...@googlegroups.com
website: http://groups.google.com/group/android-porting
-~----------~----~----~----~------~----~------~--~---

Reply via email to