Commit Graph

10796 Commits

Author SHA1 Message Date
Ben Cheng 5ece4724d1 Merge "Enable lunch command to pick up new toolchain version." 2012-12-13 10:11:21 -08:00
Ben Cheng 914f7fd938 Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-12 21:56:58 -08:00
Ben Cheng 98ce73b27a Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22." 2012-12-12 09:33:13 -08:00
Ben Cheng 5011dd80ee Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
2012-12-11 16:41:01 -08:00
Ben Cheng 62f1d86e48 Merge "Define TARGET_GCC_VERSION in target specific make files." 2012-12-11 15:52:02 -08:00
Ben Cheng 054ffd2e7c Define TARGET_GCC_VERSION in target specific make files.
So that GCC refresh can be performed in a target specific way.

Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 14:03:18 -08:00
Nick Kralevich a303510f13 Merge "x86: enable FORTIFY_SOURCE" 2012-12-11 08:41:36 -08:00
Ben Cheng a7b850864c Merge "Export TARGET_GCC_VERSION as an env variable." 2012-12-10 16:37:33 -08:00
Ben Cheng 1526670628 Export TARGET_GCC_VERSION as an env variable.
Have it referenced by the adbs tool to pick the specified toolchain.

Change-Id: I23df88946254a55d0749d6753e54559faf33e121
2012-12-10 16:06:16 -08:00
Nick Kralevich 40febcad47 x86: enable FORTIFY_SOURCE
Enable FORTIFY_SOURCE for Android x86.  This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.

FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43 (Jun 4th 2012)

Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
2012-12-07 17:20:28 -08:00
Ying Wang f8b804f8c5 Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 2012-12-03 16:00:27 -08:00
Ying Wang 96aa714534 Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
2012-12-03 15:49:13 -08:00
Jesse Hall f8728e6622 Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" 2012-11-29 10:06:04 -08:00
Jesse Hall 229b137564 Add emulator modules to PRODUCT_PACKAGES in full and sdk products
Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
2012-11-28 11:27:53 -08:00
The Android Open Source Project a2314e433e Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
Ying Wang 71958cca5d Merge "Establish explicit dependency on selinux file_contexts." 2012-11-21 11:10:32 -08:00
Ying Wang 9362c7ffdd Establish explicit dependency on selinux file_contexts.
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 11:09:45 -08:00
Ed Heyl efcc8b1c79 bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru 4749c6e3e2 Merge "build_id: change to OPENMASTER" 2012-11-19 09:23:42 -08:00
Chirayu Desai 6d492971dd build_id: change to OPENMASTER
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
2012-11-18 14:09:34 +05:30
Ben Cheng 17c679d073 Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 2012-11-16 15:48:44 -08:00
Ben Cheng 8bc4c438bd [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
2012-11-16 13:29:13 -08:00
Scott Main 34a4b8239e Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev 2012-11-16 10:43:23 -08:00
Scott Main 8f24ca8e3b docs: revise message when api level for docs is too low;
make the message appear on package pages as well

Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
2012-11-16 10:34:22 -08:00
Scott Main 11ac05bb01 docs: add script for 32/64-bit bundle downloads
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
2012-11-15 15:18:05 -08:00
Scott Main 83cd28b354 am 9efb6b09: am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
* commit '9efb6b09c4a32cc5cd190a224d15022968859ddb':
  add script to generate list of classes for each training course landing page
2012-11-14 17:40:58 -08:00
Scott Main 9efb6b09c4 am be264b6d: am 5a1123ef: add script to generate list of classes for each training course landing page
* commit 'be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
  add script to generate list of classes for each training course landing page
2012-11-14 17:39:42 -08:00
Scott Main be264b6da6 am 5a1123ef: add script to generate list of classes for each training course landing page
* commit '5a1123ef7a43c007ff4cfb6c04d3f9dc5436f1c6':
  add script to generate list of classes for each training course landing page
2012-11-14 17:38:11 -08:00
Scott Main 5a1123ef7a add script to generate list of classes for each training course landing page
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
2012-11-14 17:31:07 -08:00
Scott Main 7c05b69c0c docs: add warning message for adt when on 32-bit os
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
2012-11-14 14:12:29 -08:00
Scott Main 098d8deaef docs: add support for ndk tos wall
Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238
2012-11-13 11:40:42 -08:00
Scott Main df0e161703 docs: css fix
Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803
2012-11-13 07:52:20 -08:00
Scott Main e0c11a6f9a docs: fix broken template
Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301
2012-11-13 07:47:50 -08:00
Scott Main bbffb4bfb4 docs: add support for templated tabs with the doc title
Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0
2012-11-13 07:40:16 -08:00
Scott Main 705e8a4f61 docs: something whatever
Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09
2012-11-13 05:36:12 -08:00
Scott Main 55d99832fd docs: changes to sdk page and script for toggles
Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39
2012-11-12 23:03:59 -08:00
Scott Main 8fa7222241 am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '2953f0b0b1fcd350ff269b611a2b43fa62773943':
  add ADT Bundle to the download page
2012-11-12 18:07:58 -08:00
Scott Main 2953f0b0b1 am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit 'fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
  add ADT Bundle to the download page
2012-11-12 18:06:25 -08:00
Scott Main fef18c61f5 am db3678bc: add ADT Bundle to the download page
* commit 'db3678bcaadf74b1a940a3dafb9fda4e238250be':
  add ADT Bundle to the download page
2012-11-12 18:05:00 -08:00
Scott Main db3678bcaa add ADT Bundle to the download page
Change-Id: Ife533a32e29f2d5f1c58a42ad0b91c5053b44da4
2012-11-12 18:00:23 -08:00
Ying Wang eb98e08893 am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
2012-11-12 14:45:59 -08:00
Ying Wang 865d851a80 Merge "Remove the obsolete comments and change the misleading var name." 2012-11-12 14:34:25 -08:00
Ying Wang 85e8cda340 Remove the obsolete comments and change the misleading var name.
Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8
2012-11-12 14:31:20 -08:00
Andrew Hsieh abfb25226a resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master
Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e
2012-11-12 12:50:03 -08:00
Andrew Hsieh 8b3ce5a3c7 Merge "Use prebuilt gcc for MacOSX" 2012-11-12 11:28:10 -08:00
Andrew Hsieh e2e28f6d02 Use prebuilt gcc for MacOSX
1. Use prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
   See https://android-review.googlesource.com/#/c/46223/
2. Rewrite logic dealing with mac_sdk_version to support all
   MacOSX SDK 10.6, 10.7 and 10.8.  Note that since
   ad2342375963c2468849c1f83a97158383db6511 emulator no longer
   depends on 10.6 to build.  Since the lowest SDK among intersection
   of the "available" and the "supported" SDKs is picked, add a
   new variable MAC_SDK_VERSION for developer really want to overwrite
   it.  MAC_SDK_VERSION still has to be one of the supported, though.
3. Improve mac_sdk_path detection to deal with case where Xcode
   *dmg is mounted only, not installed at /Applications.
4. Now we can retire BUILD_MAC_SDK_EXPERIMENTAL

Change-Id: I83e463556a857d527710f766de0e19e1b576151f
2012-11-12 10:44:52 -08:00
The Android Open Source Project bc4bcf4ad0 am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge
* commit 'daa3e04e485a037b38ff0d97a04fb1e0d139b143':
  JOP40C
  JOP40B
2012-11-12 07:31:11 -08:00
The Android Open Source Project daa3e04e48 am 2e939805: Reconcile with jb-mr1-release - do not merge
* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B
2012-11-12 07:28:31 -08:00
The Android Open Source Project 2e939805af Reconcile with jb-mr1-release - do not merge
Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821
2012-11-12 07:26:05 -08:00
The Android Automerger 3f0e0921da JOP40C 2012-11-09 22:51:38 -08:00