Commit Graph

9327 Commits

Author SHA1 Message Date
Elliott Hughes b9c2a66a48 Merge "Now zoneinfo prebuilts are Android modules." 2012-07-27 14:14:57 -07:00
Ying Wang 5fb2ef65d4 Now zoneinfo prebuilts are Android modules.
(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.)

Bug: 6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
2012-07-27 13:46:40 -07:00
Jean-Baptiste Queru 47e63bb4e4 Merge "Fix build." 2012-07-27 10:05:23 -07:00
Ying Wang 7023f6179d Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
2012-07-27 09:57:36 -07:00
Andrew Boie 85f3b21971 definitions.mk: Don't use GCC '@' parameter
This parameter (which causes GCC to pull additional command line
parameters out of a file) is incompatible with ccache.

- With ccache 2.x, ccache will ignore this parameters, and potentially
compute invalid command line hashes since it is not reading the
parameter file

- With ccache 3.x, ccache will refuse to cache the files and error
with 'Unsupported compiler option'.

We still use the parameter file, but Make expands it instead.

Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-26 10:21:04 -07:00
Joe Onorato c11b5efa3a Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb" 2012-07-25 17:56:24 -07:00
Joe Onorato e35a445f2f Should have been included in 74e883d141
Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
2012-07-25 17:55:03 -07:00
Joe Onorato c22da7d7e2 Merge "Don't try to build the emulator on Mac OS if the right tools aren't installed." 2012-07-25 17:41:50 -07:00
Joe Onorato 74e883d141 Don't try to build the emulator on Mac OS if the right tools aren't installed.
Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
2012-07-25 15:01:22 -07:00
Andrew Hsieh b7391efbf0 Merge "Add -fuse-ld=bfd to x86 target" 2012-07-25 13:40:30 -07:00
Andrew Hsieh bae121afcd Add -fuse-ld=bfd to x86 target
Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
2012-07-25 11:02:52 -07:00
rpcraig 20b1d09593 Add mac_permissions.xml dependency.
Include the MMAC install perms policy configuration
file to the list of SELINUX dependencies.
This changes depends on the project:

git.selinuxproject.org/~seandroid/selinux/mac-policy

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Ief91d6a717741c91c5ba8745452bb247dc8048ec
2012-07-20 16:51:18 -04:00
Nick Kralevich 297d6c02bc Merge "Add property_contexts to SELINUX_DEPENDS." 2012-07-18 13:55:10 -07:00
Bruce Beare 42ced6d5e2 x86: cleanups for toolchain
The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.

Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-07-17 21:40:12 -07:00
Wink Saville c4e790dc64 Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
  frameworks/opt/mms

telephony-common was created by moving some of
  frameworks/base/telephony
to:
  frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-17 12:22:58 -07:00
Andrew Boie f34a9bac0e core/Makefile: also look for device/*/build/tasks
This eases cross-repo dependencies between device/ and
vendor/.

Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-17 10:22:30 -07:00
rpcraig 9e43f34840 Add property_contexts to SELINUX_DEPENDS.
This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
2012-07-05 10:50:27 -04:00
The Android Open Source Project 69cfe57ae5 Reconcile with jb-release
Change-Id: Ibc74bebbb56ee41e45e79ca3d36f176fa049c0da
2012-07-04 16:48:36 -07:00
The Android Automerger 39865ff7ed JRO03C 2012-07-04 13:53:25 -07:00
Scott Main a4d57eab27 am 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev
* commit '38f19c21258592faefa652d4871d570e151a2a53':
  docs: fix search suggestions and other script bugs for offline docs
2012-07-03 14:15:43 -07:00
Scott Main 38f19c2125 Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev 2012-07-03 14:10:57 -07:00
The Android Open Source Project cb2657d378 Reconcile with jb-release
Change-Id: Ie16ae85a5b9af4926fa1b73521163f85222958ec
2012-07-03 14:09:18 -07:00
Scott Main 1b3db11e6e docs: fix search suggestions and other script bugs for offline docs
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
2012-07-03 14:06:22 -07:00
Jean-Baptiste Queru f17d1b34d3 Ignore version change from jb-dev
Change-Id: Ia04c4664cba4abdef04f0949713f4c76281713d8
2012-07-03 14:04:38 -07:00
The Android Automerger 7f8c15f778 JRO03B 2012-07-03 14:00:39 -07:00
Ed Heyl b435a8c322 4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 14:00:39 -07:00
Ed Heyl c4c39f4d01 Merge "4.1.1" into jb-dev 2012-07-03 13:57:52 -07:00
Ed Heyl 952f55e7ae 4.1.1
Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
2012-07-03 13:54:49 -07:00
The Android Open Source Project 9c94579f0e Reconcile with jb-release
Change-Id: I23dd2b4acc6d2ca20756d6d674272a2721843d20
2012-07-03 13:30:52 -07:00
The Android Automerger 95497ec614 JRO02D 2012-07-03 12:58:46 -07:00
The Android Automerger eba6d7df71 merge in jb-release history after reset to jb-dev 2012-07-03 12:50:47 -07:00
Ying Wang 9ffe27e013 am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."
* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
  This property is set when HAVE_SELINUX:=true during build.
2012-07-03 12:16:03 -07:00
The Android Open Source Project 14c31bdc30 Reconcile with jb-release
Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11
2012-07-03 12:11:41 -07:00
Ying Wang 9e38d6bf1b Merge "This property is set when HAVE_SELINUX:=true during build." 2012-07-03 11:30:30 -07:00
William Roberts 9d8a51f537 This property is set when HAVE_SELINUX:=true during build.
This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.

Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
2012-07-03 11:05:03 -07:00
The Android Automerger b04e93207d JRO02C 2012-07-02 19:03:14 -07:00
The Android Automerger 09cb8f135c merge in jb-release history after reset to jb-dev 2012-07-02 18:58:01 -07:00
The Android Automerger 4a3e68d3fd JRO02B 2012-07-02 16:25:03 -07:00
The Android Automerger 41576e9323 merge in jb-release history after reset to jb-dev 2012-07-02 16:16:18 -07:00
The Android Automerger 2513bf5161 JRO02 2012-07-02 13:00:27 -07:00
The Android Automerger 9a1d446ec2 merge in jb-release history after reset to jb-dev 2012-07-02 12:53:12 -07:00
Ying Wang d512fda4ae am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
2012-06-29 20:19:50 -07:00
Ying Wang e42ed0ba15 Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 2012-06-29 19:55:07 -07:00
The Android Open Source Project 5081af57d3 Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
2012-06-29 18:28:17 -07:00
The Android Automerger 792ba3b87f JRN90 2012-06-29 15:57:58 -07:00
The Android Automerger 223ef2b0e5 merge in jb-release history after reset to jb-dev 2012-06-29 15:47:16 -07:00
The Android Open Source Project 8ef65998f4 Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
2012-06-29 08:13:34 -07:00
The Android Automerger e0e910e69a JRN89B 2012-06-28 17:16:17 -07:00
The Android Automerger f8997fa5a8 merge in jb-release history after reset to jb-dev 2012-06-28 17:06:01 -07:00
Ying Wang 478ba5e3f0 Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.

Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
2012-06-28 16:02:19 -07:00