|
||
|
#281
|
||||
|
||||
|
Sino recuerdo mal hace tiempo pregunto que como podia actualizar ya que al hacer repo sync había archivos que le daban error. Y sino me equivoco (tu lo sabrás mejor porque lo haces para cryos) la solución es hacer un merge de la rama de CM a los repositorios afectados.
|
|
|
|
#282
|
||||
|
||||
|
Help please...
Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
__________________
|
|
#283
|
||||
|
||||
|
Help please...
![]() Help please...
Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
![]()
__________________
|
|
#284
|
||||
|
||||
|
Sino recuerdo mal hace tiempo pregunto que como podia actualizar ya que al hacer repo sync había archivos que le daban error. Y sino me equivoco (tu lo sabrás mejor porque lo haces para cryos) la solución es hacer un merge de la rama de CM a los repositorios afectados.
![]() Luego tenemos otra carpeta (/git) donde tenemos la copia local de los repositorios de cryos, donde realizamos los cambios. De esta manera, cuando queremos probar alguna funcionalidad nueva, copiamos el código de la carpeta git a la cryos y compilamos. Si funciona hacemos un git push desde la carpeta git y eliminamos la carpeta que hemos modificado en cryos para que al hacer repo sync en cryos no de fallo. No se si me explico... Jeje Seguramente haya alguna manera diferente y mas rápida, pero a mi me funciona bien y creo que gerar lo hace igual. Edito: en la carpeta git tengo una carpeta por repositorio, y cada copia local de cada repo la tengo con varios remote, entre ellos un remote llamado cryos y otro llamado cm.
__________________
|
| Gracias de parte de: | ||
|
#285
|
||||
|
||||
|
Cuando haces un cherry-pick cada vez que hay un error al fusionar el código se añade una línea del tipo "<<<<< HEAD" al principio del error y otra linea similar al final del error.
Tienes que revisar manualmente cada fichero con errores para poder fusionar el código correctamente. PD1: siento el doble post, pero en el móvil es un tanto complicado... jeje PD2 (para David_Vaz): no hace falta que repitas tu post (igual ha sido un accidente, pero podrías editarlo) porque, por ejemplo, en el móvil se visualiza muy mal el hilo, porque son comentarios muy largos (recuerda que en tapatalk el texto entre CODE y /CODE no se ve igual que en el ordenador). Por otro lado, si necesitas ayuda con algún problema, da más detalles de lo que has hecho, como lo has hecho, etc... porque si no es bastante difícil que te podamos ayudar y será aún más complicado que un futuro usuario con tu mismo problema pueda ver la solución al mismo problema. Esto no lo digo para que te cabrees o para tocarte las narices, es simplemente un consejo que puedes tomar en cuenta o no, eso es decisión tuya, pero ten por seguro que ayudará a que todo funcione mejor.
__________________
Última edición por AlvaroOrduna Día 25/09/13 a las 10:42:18. |
| Gracias de parte de: | ||
|
#286
|
||||
|
||||
|
Cuando haces un cherry-pick cada vez que hay un error al fusionar el código se añade una línea del tipo "<<<<< HEAD" al principio del error y otra linea similar al final del error.
Tienes que revisar manualmente cada fichero con errores para poder fusionar el código correctamente. PD1: siento el doble post, pero en el móvil es un tanto complicado... jeje PD2 (para David_Vaz): no hace falta que repitas tu post (igual ha sido un accidente, pero podrías editarlo) porque, por ejemplo, en el móvil se visualiza muy mal el hilo, porque son comentarios muy largos (recuerda que en tapatalk el texto entre CODE y /CODE no se ve igual que en el ordenador). Por otro lado, si necesitas ayuda con algún problema, da más detalles de lo que has hecho, como lo has hecho, etc... porque si no es bastante difícil que te podamos ayudar y será aún más complicado que un futuro usuario con tu mismo problema pueda ver la solución al mismo problema. Esto no lo digo para que te cabrees o para tocarte las narices, es simplemente un consejo que puedes tomar en cuenta o no, eso es decisión tuya, pero ten por seguro que ayudará a que todo funcione mejor. ![]() Y perdón por el doble post.. El tapatalk es muy traidor
__________________
|
| Gracias de parte de: | ||
|
#287
|
||||
|
||||
|
Es decir incluir Halo/Navbar Multi DPI (gracias a gerar) , antes de continuar otra vez con los cherry del ActiveDiisplay git merge github/cm-10.2 Updating cd1856c..da0b220 error: Your local changes to the following files would be overwritten by merge: core/res/res/values-ca/cm_strings.xml core/res/res/values-zh-rCN/cm_strings.xml packages/SystemUI/res/values-fr/cm_strings.xml packages/SystemUI/res/values-hu/cm_strings.xml packages/SystemUI/res/values-ru/cm_strings.xml packages/SystemUI/res/values-zh-rCN/cm_strings.xml Please, commit your changes or stash them before you can merge. git commit -a fatal: Unable to create '/Volumes/android/cm10.2/frameworks/base/.git/index.lock': File exists. If no other git process is currently running, this probably means a git process crashed in this repository earlier. Make sure no other git process is running and remove the file manually to continue. Gracias! Última edición por menan Día 25/09/13 a las 13:31:25. |
|
#288
|
||||
|
||||
|
Voy a explicarme bien..
En SOURCE/frameworks/base Puse este comando: Código:
git remote add -f TM https://github.com/PurityROM/platform_frameworks_base && git cherry-pick 4214ff05fcf76d22bde4141a8a77a13f16237dc6 Puse a compilar.. Y salió el error que puse más arriba.. que es este: Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
__________________
|
|
#289
|
||||
|
||||
|
Voy a explicarme bien..
En SOURCE/frameworks/base Puse este comando: Código:
git remote add -f TM https://github.com/PurityROM/platform_frameworks_base && git cherry-pick 4214ff05fcf76d22bde4141a8a77a13f16237dc6 Puse a compilar.. Y salió el error que puse más arriba.. que es este: Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
![]() |
| Gracias de parte de: | ||
|
#290
|
||||
|
||||
|
Voy a explicarme bien..
En SOURCE/frameworks/base Puse este comando: Código:
git remote add -f TM https://github.com/PurityROM/platform_frameworks_base && git cherry-pick 4214ff05fcf76d22bde4141a8a77a13f16237dc6 Puse a compilar.. Y salió el error que puse más arriba.. que es este: Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
![]() Código:
<<<<<<< HEAD
__________________
![]()
|
| Gracias de parte de: | ||
|
#291
|
||||
|
||||
|
Código limpio y ya veré que halo...
__________________
|
|
#293
|
||||
|
||||
|
Seguramente te estas comiendo " ; " y cosas de esas. No puedes borrar cosas asi porque si, sino lo que corresponde.
|
|
#294
|
||||
|
||||
|
Es que yo y Gerar la hacemos diferente. Tenemos una carpeta (/cryos) para el código completo de la ROM y ese no se toca.
Luego tenemos otra carpeta (/git) donde tenemos la copia local de los repositorios de cryos, donde realizamos los cambios. De esta manera, cuando queremos probar alguna funcionalidad nueva, copiamos el código de la carpeta git a la cryos y compilamos. Si funciona hacemos un git push desde la carpeta git y eliminamos la carpeta que hemos modificado en cryos para que al hacer repo sync en cryos no de fallo. No se si me explico... Jeje Seguramente haya alguna manera diferente y mas rápida, pero a mi me funciona bien y creo que gerar lo hace igual. Edito: en la carpeta git tengo una carpeta por repositorio, y cada copia local de cada repo la tengo con varios remote, entre ellos un remote llamado cryos y otro llamado cm. ![]() Yo creía que par actualizar con los cambios de CM hacíais un merge de su rama (es lo que he hecho yo para actualizar de 4.3r2.1 a 4.3r3.1) Voy a explicarme bien..
En SOURCE/frameworks/base Puse este comando: Código:
git remote add -f TM https://github.com/PurityROM/platform_frameworks_base && git cherry-pick 4214ff05fcf76d22bde4141a8a77a13f16237dc6 Puse a compilar.. Y salió el error que puse más arriba.. que es este: Código:
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
^
![]() Última edición por mbc596 Día 25/09/13 a las 15:32:45. |
|
#295
|
||||
|
||||
|
Bueno, yo tengo un error, que nunca antes había visto y realmente, no se como afrontarlo.
Se trata de esto Código:
In file included from frameworks/base/tools/aapt/AaptAssets.h:11:0,
from frameworks/base/tools/aapt/ResourceFilter.h:10,
from frameworks/base/tools/aapt/ResourceFilter.cpp:7:
frameworks/base/include/androidfw/ResourceTypes.h:1007:32: error: 'ACONFIGURATION_UI_INVERTED_MODE_ANY' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1008:35: error: 'ACONFIGURATION_UI_INVERTED_MODE_NORMAL' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1009:32: error: 'ACONFIGURATION_UI_INVERTED_MODE_YES' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1010:31: error: 'ACONFIGURATION_UI_INVERTED_MODE_NO' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1040:35: error: 'ACONFIGURATION_UI_INVERTED_MODE' was not declared in this scope
In file included from frameworks/base/tools/aapt/AaptAssets.h:11:0,
from frameworks/base/tools/aapt/AaptAssets.cpp:5:
frameworks/base/include/androidfw/ResourceTypes.h:1007:32: error: 'ACONFIGURATION_UI_INVERTED_MODE_ANY' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1008:35: error: 'ACONFIGURATION_UI_INVERTED_MODE_NORMAL' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1009:32: error: 'ACONFIGURATION_UI_INVERTED_MODE_YES' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1010:31: error: 'ACONFIGURATION_UI_INVERTED_MODE_NO' was not declared in this scope
frameworks/base/include/androidfw/ResourceTypes.h:1040:35: error: 'ACONFIGURATION_UI_INVERTED_MODE' was not declared in this scope
Os paso el commit: https://github.com/PurityROM/platfor...02fe75664ae1d9 Un saludo.
__________________
![]()
|
|
#296
|
||||
|
||||
|
Buenoo por fin encontre el que era mi problema con los commits - cherry-picks .
Añado que trabajo sobre os x que pasó .. pues que no tenia editor para git.... ohhhhhhhhhhh !! que iba a saber yo.. bueno asi que añadi git config core.editor "nano" y ![]() ![]() ![]() por eso siempre tenía las lineas verdess!!! ahi!!! ![]() |
| Gracias de parte de: | ||
|
#297
|
||||
|
||||
|
Buenoo por fin encontre el que era mi problema con los commits - cherry-picks .
Añado que trabajo sobre os x que pasó .. pues que no tenia editor para git.... ohhhhhhhhhhh !! que iba a saber yo.. bueno asi que añadi git config core.editor "nano" y ![]() ![]() ![]() por eso siempre tenía las lineas verdess!!! ahi!!! ![]() ![]()
__________________
![]()
|
| Gracias de parte de: | ||
|
#298
|
||||
|
||||
|
A que se puede deber que me cree perfectamente el zip.
no bootloader.img in target_files; skipping install no radio.img in target_files; skipping install running: openssl pkcs8 -in build/target/product/security/testkey.pk8 -inform DER -nocrypt running: java -Xmx2048m -jar /Volumes/android/cm10.2/out/host/darwin-x86/framework/signapk.jar -w build/target/product/security/testkey.x509.pem build/target/product/security/testkey.pk8 /var/folders/9w/_lb73rgx4pqbmkrffw46lr100000gn/T/tmpHiMX6J /Volumes/android/cm10.2/out/target/product/mako/cm_mako-ota-eng.lis4rd0.zip done. Package Complete: /Volumes/android/cm10.2/out/target/product/mako/cm-10.2-20130928-UNOFFICIAL-mako.zip pero cuando la flasheo desde el CWM y reinicio pantalla negra no carga.Logo google y oscura(encendida) Gracias! |
|
#299
|
||||
|
||||
|
A que se puede deber que me cree perfectamente el zip.
no bootloader.img in target_files; skipping install no radio.img in target_files; skipping install running: openssl pkcs8 -in build/target/product/security/testkey.pk8 -inform DER -nocrypt running: java -Xmx2048m -jar /Volumes/android/cm10.2/out/host/darwin-x86/framework/signapk.jar -w build/target/product/security/testkey.x509.pem build/target/product/security/testkey.pk8 /var/folders/9w/_lb73rgx4pqbmkrffw46lr100000gn/T/tmpHiMX6J /Volumes/android/cm10.2/out/target/product/mako/cm_mako-ota-eng.lis4rd0.zip done. Package Complete: /Volumes/android/cm10.2/out/target/product/mako/cm-10.2-20130928-UNOFFICIAL-mako.zip pero cuando la flasheo desde el CWM y reinicio pantalla negra no carga.Logo google y oscura(encendida) Gracias! ![]() |
|
|