Commit Graph

9311 Commits

Author SHA1 Message Date
Joe Onorato f72e34ebf4 Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
* changes:
  Move the old user tagged modules over to base.mk so mini and core both share them.
  More product debugging.
  build system changes for jb-aah-dev merge
  Fail when a non-vendor product references a vendor module.
  Remove support for user tags in the build system.
  List the user modules explicitly, and we can get rid of the support for the user tag!
  Dump the user tagged modules.
  host modules don't need LOCAL_MODULE_TAGS
  Don't give the user tag to host modules automatically.
  Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
  Add tool to parse make dependency info from new --deps flag.
  Use a more modern -j flag.
  make product-graph now filtered
2012-08-16 23:37:45 -07:00
Joe Onorato 22273e6cfe Move the old user tagged modules over to base.mk so mini and core both share them.
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
2012-08-16 22:36:41 -07:00
Joe Onorato f3319452ad More product debugging.
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:36:41 -07:00
Joe Onorato 26ead966d7 build system changes for jb-aah-dev merge
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2012-08-16 22:36:41 -07:00
Joe Onorato 75493610b3 Fail when a non-vendor product references a vendor module.
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
2012-08-16 22:36:41 -07:00
Joe Onorato 529302d912 Remove support for user tags in the build system.
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.

Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
2012-08-16 22:36:41 -07:00
Joe Onorato 8cfca47f5a List the user modules explicitly, and we can get rid of the support for the user tag!
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
2012-08-16 22:36:40 -07:00
Joe Onorato d23c3235fa Dump the user tagged modules.
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
2012-08-16 22:36:40 -07:00
Joe Onorato b4da6b50fe host modules don't need LOCAL_MODULE_TAGS
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:36:40 -07:00
Joe Onorato f85cb7c936 Don't give the user tag to host modules automatically.
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
2012-08-16 22:36:40 -07:00
Joe Onorato d6b1d628be Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
2012-08-16 22:36:40 -07:00
Joe Onorato cc788043b7 Add tool to parse make dependency info from new --deps flag.
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:36:40 -07:00
Joe Onorato 6ea77a2dc8 Use a more modern -j flag.
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:36:40 -07:00
Joe Onorato f5debbfee6 make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:36:40 -07:00
Jean-Baptiste Queru 6020d698f5 Merge "select.mk: Tune ccache options" 2012-08-16 14:55:26 -07:00
Andrew Boie 1f93043c86 select.mk: Tune ccache options
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-08-16 11:11:29 -07:00
Elliott Hughes f2a618e1df Merge "The zoneinfo stuff is no longer legacy." 2012-08-15 19:43:41 -07:00
Elliott Hughes e1654eaccb The zoneinfo stuff is no longer legacy.
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
2012-08-15 18:34:49 -07:00
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