Jean-Baptiste Queru
4eddad550e
Merge "Set the AOSP master to be API level 16"
2012-08-14 10:51:21 -07:00
Jean-Baptiste Queru
e46e8603b2
Set the AOSP master to be API level 16
...
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
2012-08-14 09:07:33 -07:00
Ying Wang
392bdc1f08
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
2012-08-13 15:41:12 -07:00
Ying Wang
82ccebaa59
Move the selinux modules to core PRODUCT_PACKAGES
...
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.
Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
2012-08-13 15:40:43 -07:00
Ying Wang
679b7498af
Merge "Add mac_permissions.xml dependency."
2012-08-13 14:52:24 -07:00
Elliott Hughes
20e713d151
Merge "Remove TARGET_linux-sh.mk."
2012-08-11 09:34:51 -07:00
Elliott Hughes
5f6c7fd884
Remove TARGET_linux-sh.mk.
...
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
2012-08-10 15:36:51 -07:00
Jean-Baptiste Queru
968f20a4c2
Merge "MIPS support to *.mk files and envsetup.sh"
2012-08-10 09:16:20 -07:00
Raghu Gandham
8da4310646
MIPS support to *.mk files and envsetup.sh
...
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-10 09:15:38 -07:00
Jean-Baptiste Queru
6e6d92c47a
Merge "Support for MIPS Build targets."
2012-08-10 08:39:34 -07:00
Jean-Baptiste Queru
e443a9e92f
Merge "Modify full_mips-eng build in line with the full-eng build"
2012-08-10 08:39:10 -07:00
Jean-Baptiste Queru
8776f34aaa
Merge "x86: cleanups for toolchain"
2012-08-08 13:40:19 -07:00
Jean-Baptiste Queru
4733cfd2de
Merge "definitions.mk: Don't use GCC '@' parameter"
2012-08-08 13:18:56 -07:00
Jean-Baptiste Queru
af541a64ab
Merge "core/Makefile: also look for device/*/build/tasks"
2012-08-08 12:58:56 -07:00
Raghu Gandham
06afc1c5ab
Support for MIPS Build targets.
...
Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 11:18:25 -07:00
Chris Dearman
1603e3a987
Modify full_mips-eng build in line with the full-eng build
...
Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 11:04:09 -07:00
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