Commit graph

5096 commits

Author SHA1 Message Date
Geremy Condra
740b6636cc Add support for signed boot images. 2014-07-10 14:53:08 -07: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
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
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
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
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
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
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
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
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
9327f77a01 am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  Fix missing rs_compatibility_jni_libs.
2014-06-30 18:30:46 +00:00
Ying Wang
ccbf593046 am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
  Fix missing rs_compatibility_jni_libs.
2014-06-30 18:25:37 +00:00
Ying Wang
a626d3b44b Fix missing rs_compatibility_jni_libs.
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:17:16 -07:00
Brian Carlstrom
191e5988d0 resolved conflicts for merge of da92aef7 to master
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
2014-06-28 13:54:24 -07:00
Ian Rogers
da92aef762 am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink"
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
  Host support for prefer symlink
2014-06-28 00:36:10 +00:00
Ian Rogers
8625b6e74a am 7634e413: Merge "Host support for prefer symlink"
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
  Host support for prefer symlink
2014-06-28 00:30:43 +00:00
Ying Wang
efe7779cfb Fix missing rs_compatibility_jni_libs.
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:20:41 -07:00
Ian Rogers
cf331d931d Host support for prefer symlink
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
2014-06-27 17:23:03 -07:00
Ying Wang
7a6a9a5582 am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
  Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:19:26 +00:00
Ying Wang
4bdbd6d434 am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
  Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:14:30 +00:00
Ying Wang
8d43e17bfd Merge "Support to check System API." 2014-06-27 15:56:14 +00:00
Ying Wang
829f68bb02 Support to check System API.
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
2014-06-26 17:54:28 -07:00
Colin Cross
e2543ea2ea Merge "build: fix vendor symbols in gdb" 2014-06-26 18:42:03 +00:00
Colin Cross
d00c0a2e20 HACK: report CPU abi as 2nd arch if present
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.

Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Colin Cross
a58f8e04c9 build: fix vendor symbols in gdb
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries

Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
2014-06-27 10:48:22 -07:00
Ying Wang
a26a2123b8 am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
  Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:24:46 +00:00