Commit Graph

19006 Commits

Author SHA1 Message Date
Elliott Hughes 45a45d611f am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
  ADBS now uses stack_core code to parse traces.
2014-07-09 01:28:20 +00:00
Elliott Hughes a97f675c92 am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '1b1840cbef77f2abfe95af56bc927c647a693429':
  ADBS now uses stack_core code to parse traces.
2014-07-08 20:15:39 +00:00
Elliott Hughes 1b1840cbef am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit 'af95db033de4808826fde12772a6d33a72dda608':
  ADBS now uses stack_core code to parse traces.
2014-07-08 20:12:20 +00:00
Dan Albert 8f73aeea87 am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
  Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert 183f90f40c am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
  Remove -Bsymbolic from builds.
2014-07-08 18:51:44 +00:00
Dan Albert 3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Joe LaPenna 6b37fd7483 Merge "CW on Master: Add wifi-service to core_tiny" 2014-07-08 17:33:57 +00:00
Dan Albert 9d8d20a1e1 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-08 18:59:48 +00:00
Joe LaPenna bde7cc108c CW on Master: Add wifi-service to core_tiny
BUG: 15143878

Change-Id: Idd31188456fa5cf9622f2ff754157286b3de97d1
2014-07-08 11:38:10 -07:00
Ying Wang 55ec7e63d0 am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
  Fix host java doc by referring to the correct classpath.
2014-07-08 01:38:44 +00:00
Ying Wang 9e00b6385c am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit 'cd02c025ad6b0647d612c4b939df8e5de55f5192':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:48:55 +00:00
Ying Wang cd02c025ad am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '979d578ee40c0a7d3e25915049350a23165f7a5a':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:43:42 +00:00
Ying Wang f951b7743f am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '1c00c7026c23967ca33524356dc11d9885f960f9':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:31:00 +00:00
Ying Wang 1c00c7026c am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '45322890266c1d704b130fabd7ee5bab5db35997':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:26:10 +00:00
Ying Wang 4532289026 am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:22:13 +00:00
Ying Wang 1a5ada11d5 Auto-clean obsolete aidl-generated Java files.
The build system compares aidl files of every module to the previous
build and deletes the intermediate generated source dir if an aidl file
has gone.

Change-Id: I55fcfe1baaae3496613e12c20bca564d408bba58
2014-07-07 16:58:39 -07:00
Elliott Hughes af95db033d Merge "ADBS now uses stack_core code to parse traces." 2014-07-07 18:07:41 +00:00
Brigid Smith 90c66cff3a ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang 5769e2a0c0 am e68ec719: (-s ours) [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
* commit 'e68ec719039406bfcc6cd8b1cab4890afbeb66a8':
  [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
2014-07-07 18:00:39 +00:00
Brian Carlstrom ba3c00765c am 3be473bd: am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '3be473bdb5297094bb48a10b8b388e1071ed999e':
  Strip all multidex files, not just classes.dex
2014-07-02 23:13:32 +00:00
Ying Wang f50459c6e5 am 51f01f64: am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit '51f01f643f361d0918c181c9fc549f98f873dce9':
  Fix partition_tag usage in install_jni_libs
2014-07-02 23:13:29 +00:00
Ying Wang e68ec71903 [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
2014-07-02 14:26:49 -07:00
Ying Wang 979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang ad7809bba4 Fix host java doc by referring to the correct classpath.
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
2014-07-07 16:50:39 -07:00
Ying Wang d2aa51b8ae Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX." 2014-07-02 20:49:53 +00:00
Ying Wang f25318a5f9 Clean the last bit of LOCAL_BUILD_HOST_DEX.
Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
2014-07-07 17:15:38 -07:00
Nick Vaccaro 684ee2b544 Add ims-common to PRODUCT_PACKAGES
Bug: 15143878
Change-Id: I0f244530d46380b329cc43112981f6daaee39628
2014-07-02 19:35:10 +00:00
Brian Carlstrom 3be473bdb5 am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
  Strip all multidex files, not just classes.dex
2014-07-02 16:44:19 +00:00
Brian Carlstrom 97609d7f0b am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
  Strip all multidex files, not just classes.dex
2014-07-02 16:39:23 +00:00
Ying Wang 51f01f643f am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit 'bf0a9c4ac842f340f4d995205999ed472b124f17':
  Fix partition_tag usage in install_jni_libs
2014-07-02 16:20:40 +00:00
Ying Wang bf0a9c4ac8 am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit 'cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
  Fix partition_tag usage in install_jni_libs
2014-07-02 16:15:35 +00:00
Ying Wang cc80f5a1ff Merge "Fix partition_tag usage in install_jni_libs" 2014-07-02 05:05:51 +00:00
Dan Willemsen 731322a90d Fix partition_tag usage in install_jni_libs
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
2014-07-01 18:56:31 -07:00
Brian Carlstrom 7b53bca0b9 Merge "Strip all multidex files, not just classes.dex" 2014-07-01 23:33:34 +00:00
Brian Carlstrom fca814550c Strip all multidex files, not just classes.dex
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
2014-07-01 23:04:36 -07:00
Santos Cordon 2b432869de Merge "Add phone directory to frameworks/base." 2014-07-01 19:22:38 +00:00
Santos Cordon 7d36e1574f Add phone directory to frameworks/base.
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5

Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
2014-07-02 18:05:25 +00:00
Ying Wang 00c67a0568 Fix typo.
Bug: 15978907
Bug: 15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
2014-06-30 18:01:46 -07:00
Brian Carlstrom a5eb17b0ac Merge "Fixes for core_tiny zygote to boot" 2014-07-01 00:40:37 +00:00
Brian Carlstrom de5dce1ad1 Fixes for core_tiny zygote to boot
Change-Id: Ie926eb316d05702ddb715ca4519397e9be0e7049
2014-07-01 11:51:17 -07:00
Ying Wang dcc8b3729d Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

Change-Id: I6095c7ccf0660ba7b17a659f5df29b05e50e6303
2014-07-01 10:58:10 -07:00
Ying Wang e050245b7a am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.
2014-07-01 00:35:21 +00:00
Ying Wang 0d0b7b3669 am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
  More consistent host library path in multilib build.
2014-07-01 00:28:14 +00:00
Ying Wang 2530c787db am 4b539d15: Merge "More consistent host library path in multilib build."
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
  More consistent host library path in multilib build.
2014-07-01 00:22:30 +00:00
Elliott Hughes 0635498086 am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 23:04:35 +00:00
Elliott Hughes 3a2f6ecf3f am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:59:37 +00:00
Elliott Hughes 491871aa03 am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
  Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:53:49 +00:00
Ying Wang 4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang 36ef50f2a2 More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
2014-06-30 17:06:21 -07:00
Ying Wang 704776e14e am 9327f77a: am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '9327f77a01828e0d13dc32be295d6338fe339abc':
  Fix missing rs_compatibility_jni_libs.
2014-06-30 18:36:07 +00:00