History log of /build/make/core/main.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c2e074c081083604623fa61f7031f5c467e7e308 16-May-2018 Alan Ma <alanma@google.com> Add a build task for cts_instant

Test: With other CLs in the topic, run 'm -j30 cts_instant'

bug: 79750671
Change-Id: Ib0381017300108a22919892070540b9e7f92aaf9
/build/make/core/main.mk
52e14a617d675bf09588c652ba478ba7da9e676d 17-Apr-2018 Dan Willemsen <dwillemsen@google.com> Merge "Add variables for configuring Soong plugins" into pi-dev
5364f5a298379e149f1db5035db759a62bcc0d5d 12-Apr-2018 Isaac Chen <ycchen@google.com> Enable vndk_package if BOARD_VNDK_VERSION is set

This is a first attempt to enable build system support to include
vndk_package automatically (if BOARD_VNDK_VERSION is set), so devices
don't need to add it via PRODUCT_PACKAGE manually.

Bug: b/67002788
Test: Booted on the x86 emulator and a physical device and checked
their /system/lib*/vndk-* directories for vndk_package libraries.
# The commands below are for the x86 emulator:
$ lunch aosp_x86_64-userdebug; m -j
Change-Id: Iea927b9535c7ee1b64ca130a4ac54f0fd8b3f758
/build/make/core/main.mk
79657520eec053cc06c3f2d323c23aa223240bfe 13-Mar-2018 Dan Willemsen <dwillemsen@google.com> Add variables for configuring Soong plugins

See the Soong commit for detailed usage.

Bug: 76168832
Test: define some variables, use them
Change-Id: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
Merged-In: Ia8af5b6ec1cb3f12cbc1fee582a309eebb340b7c
(cherry picked from commit eaacf5b2851c6a9aac27b4e6a3c7bc8ce320f1ab)
/build/make/core/main.mk
389bbe45a220dfa9544c2b514a51e74fa4106e05 06-Mar-2018 Dan Willemsen <dwillemsen@google.com> Support a pre-extracted PDK zip

Pre-extracting the zip files are more sustainable for git, so that
objects can be shared if unchanged, rather than the 900MB zip file
changing on every build.

This also has the advantage that we could put an Android.bp file inside
the PDK, and Soong would just pick it up.

Bug: 68767391
Test: Build mini_arm64 PDK with platform.zip
Test: Build mini_arm64 PDK with extracted zip file
Change-Id: I16db030a731aea55b69c1d6e2260dbd70b167544
Merged-In: I16db030a731aea55b69c1d6e2260dbd70b167544
(cherry picked from commit 0663f685c220d825f4f163533e3bdd1f5765fb94)
/build/make/core/main.mk
e47e3d302f2fce88710bac8cd6b7ba03947a24a0 02-Mar-2018 Jayant Chowdhary <jchowdhary@google.com> Merge "Collect all lsdump paths and write them to $(OUT_DIR)." am: 1fa15d7491
am: 210dc9010b

Change-Id: Ib589fa0c952eaa0cdf762c7cc550e6ed9714203c
67e0cc5d638616fcf82a846479bd2e9acb4e8dda 24-Feb-2018 Jayant Chowdhary <jchowdhary@google.com> Collect all lsdump paths and write them to $(OUT_DIR).

$(OUT_DIR)/target/product/$(TARGET_DEVICE)/lsdump_paths.txt will contain all
.lsdump paths relative to $(ANDROID_BUILD_TOP). This helps faster lookup while
running scripts to generate reference dumps.

Test: m -j findlsdumps for aosp_arm64_ab.
$OUT_DIR/lsdump_paths/generic_arm64_ab/paths.txt has paths to lsdump files
generated for the build.

Test: m -j findlsdumps for aosp_arm_ab.
$OUT_DIR/target/product/generic_arm_ab/lsump_paths.txt has paths to
lsdump files generated for the build.

Change-Id: Iab1640f57bf9d0af5e88e6dda64a610fedcbe87e
/build/make/core/main.mk
7e634580bacb1a5efaa8b33160e0212c6269f95b 22-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
0abdb5811d220f6e1a28d114a46cb76306a4a3ff 21-Feb-2018 Nan Zhang <nanzhang@google.com> Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.

<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
/build/make/core/main.mk
649f5b3c9a2bc3912162b0e1d903b1cc958dc9e1 15-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f
am: 03bca8c4a8

Change-Id: I3f8e13a53dbd3217f3ae15b9512d3bb917695df1
975f41ed349c7105d7b685371723a3f6bac199bc 14-Feb-2018 Nan Zhang <nanzhang@google.com> Remove BUILD_DATETIME from Make.

Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
/build/make/core/main.mk
605ab4554a7f86b5f929fd2b201cb27e521e4a02 07-Feb-2018 Simran Basi <sbasi@google.com> Merge "LOCAL_HOST_REQUIRED_MODULES support" am: 9ffbc10126
am: 79a2a1e889

Change-Id: Ide6abb89c676bcf8785e60e4f798740b835cbede
893098b06c8755f9239d55efddb651a08b2b21ad 02-Feb-2018 Simran Basi <sbasi@google.com> LOCAL_HOST_REQUIRED_MODULES support

Allows target modules to directly request host modules they
require to be built and installed as well.

Bug: 72761631
Test: Added LOCAL_HOST_REQUIRED_MODULES to a target apk test and
the host module was built.

Change-Id: I5aca11b3ba8b54676f068d337f1c9ba0e0b01997
/build/make/core/main.mk
ebbd39f4fdc6e10d8235f278ba285fa56d5b27cf 29-Jan-2018 David Brazdil <dbrazdil@google.com> Merge "Add flag to control hidden API warning toasts" am: 4e6c5218db
am: 744c286b07

Change-Id: Ib0734cf6c5a127c2f2c55fd381b10631839a7229
41847e1917b0b8614a046a45a8a7812ce9034e0b 25-Jan-2018 David Brazdil <dbrazdil@google.com> Add flag to control hidden API warning toasts

Just like visual warnings about improper use of native libraries,
warnings about the usage of hidden APIs will be displayed in non-
final, non-user builds only.

Bug: 64382372
Test: make
Change-Id: Id0a4200f912ac3303026cb26b6d8974c47332828
/build/make/core/main.mk
f430ea5ebfa21da0bcd2857be121d457425c298a 25-Jan-2018 Jaekyun Seok <jaekyun@google.com> Merge "Support /product partition" am: 8fe7f9bfa2
am: 039e0991d5

Change-Id: I325ae6518c55f1fc310233a5f67ce3df1ae4940f
b7735d81054002961b681f4bdf296d4de2701135 27-Nov-2017 Jaekyun Seok <jaekyun@google.com> Support /product partition

This CL adds the following build flags to support building product partition
from Android build system.
- BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS
- BOARD_AVB_PRODUCT_KEY_PATH
- BOARD_AVB_PRODUCT_ALGORITHM
- BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION
- BOARD_PREBUILT_PRODUCTIMAGE
- BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT
- BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
- BOARD_PRODUCTIMAGE_PARTITION_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_USES_PRODUCTIMAGE
- LOCAL_PRODUCT_MODULE
- PRODUCT_FOOTER_ARGS
- PRODUCT_PRODUCT_BASE_FS_PATH
- PRODUCT_PRODUCT_VERITY_PARTITION
- TARGET_COPY_OUT_PRODUCT
- TARGET_OUT_PRODUCT*

And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific
properties in /product/build.prop.

Bug: 64195575
Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE,
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION.

Change-Id: I774e6a38003734421591e51bed103802ff84f432
/build/make/core/main.mk
b82c709942ffe8964304eb2fdbe225464fe0901e 19-Jan-2018 Jaekyun Seok <jaekyun@google.com> Merge "Enforce PRODUCT_COMPATIBLE_PROPERTY for products shipping with Android P" am: 8b4b0cc5a1
am: 3b4329ab47

Change-Id: I1f4969866235eb28e555f5092f8c7b3b753e7025
0538ff796f1d17c084bc0b54cb2177faacda8919 16-Jan-2018 Jaekyun Seok <jaekyun@google.com> Enforce PRODUCT_COMPATIBLE_PROPERTY for products shipping with Android P

PRODUCT_COMPATIBLE_PROPERTY will be set as true for products shipping
with Android P, and ro.actionable_compatible_property.enabled will be set
as a system default property accordingly.
But if PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE is set,
ro.actionable_compatible_property.enabled will be false.

Bug: 38146102
Test: tested on walleye with PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE=true
Merged-In: Ifc1279a360b140c4d94edd32db7de3c6c7317297
Change-Id: Ifc1279a360b140c4d94edd32db7de3c6c7317297
(cherry picked from commit 2528cd26c0140248e83c4f232b080aa962b90026)
/build/make/core/main.mk
9874ee6c540845d8e70b45976e22e55e6e4355fa 18-Dec-2017 Steven Moreland <smoreland@google.com> Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810
am: a710d44086

Change-Id: I39b94bef18b12f0e55bc1d0eaabde2ba85f00146
5dcea5de76ef0edb69b5f8aa71a99be707ccb324 15-Dec-2017 Steven Moreland <smoreland@google.com> .KATI_obsolete PRODUCT_FULL_TREBLE.

It has been broken up into subflags, and usage has been cleaned up.

Bug: 69865032
Test: can't use PRODUCT_FULL_TREBLE
Change-Id: Ia38366a30132f129d09c6f4a985402c202bace62
/build/make/core/main.mk
c95bf7aa1d4af8f20c7552fdfff3c75d55ebb0c9 13-Dec-2017 Colin Cross <ccross@android.com> Merge "Add soong_docs to droidcore" am: f027511929
am: 5d8b68daca

Change-Id: Idac784ec8ef50063faa3d772b9b52beebd7a3b3a
2c1da1e95f0ad34f34570916ba9eeeef9b29cf4c 12-Dec-2017 Colin Cross <ccross@android.com> Add soong_docs to droidcore

Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
/build/make/core/main.mk
5f03da0404bdc80c9435e02e87a51e80d9f31520 07-Dec-2017 Xin Li <delphij@google.com> Merge "DO NOT MERGE: Merge Oreo MR1 into master"
c0715eb231ec92c171d28dad831ff7433ea0d3a0 06-Dec-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663
am: a659799786

Change-Id: I878bdedce803df1b4e74c429901e1e04b7d73002
a659799786f20c166efa4d262b2ee32ffb54e458 06-Dec-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting"
am: 5313503663

Change-Id: Iefc4b4cecb6f22b39ec66675fffe65ac62a18e79
5313503663c03baee922673e9f3d8b5a41731325 06-Dec-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting"
d269f266aaa14c0504590f3250f85da5684863d6 06-Dec-2017 Badash <badash@google.com> initial add sts to build am: bb7a920294 am: b4bd17c9ad
am: 2f8a8b8a18

Change-Id: I34a6d4c7e16c0340d0a74bb1bcc2a29a2e850b1e
2f8a8b8a188bd3e974c2d2a3dc8048512c297c55 06-Dec-2017 Badash <badash@google.com> initial add sts to build am: bb7a920294
am: b4bd17c9ad

Change-Id: I94ff95c77545981dfe7e466e4e1a105f45e38472
b4bd17c9ad3028b74fdbfe861b6aabd6a193bff8 06-Dec-2017 Badash <badash@google.com> initial add sts to build
am: bb7a920294

Change-Id: I63038aeb98fa6008e1217f8caf7ec749a0ea749e
bb7a92029486b4b5ee111a87206f3a0ce299fdc2 04-Oct-2017 Badash <badash@google.com> initial add sts to build

Test: Local build with other CLs in topic

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb23210b64f08276d16eaabbc57852d0)
/build/make/core/main.mk
44dd4881defd4589fad6fdd8596d6bc6f3f9dfb5 14-Nov-2017 Xin Li <delphij@google.com> Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
207b009c86617077fad2b0fa78cee769f09e5fd7 11-Nov-2017 Dan Willemsen <dwillemsen@google.com> Merge "Enable missing dependency checks"
e43d8ee8ff2fcbec06fd70601e0fc38d7105485e 18-Apr-2017 Dan Willemsen <dwillemsen@google.com> Enable missing dependency checks

With this enabled, we'll check the entire build graph for missing
dependencies -- even if you don't need to build the module. So it'll
present more errors, but surface them earlier.

These can be turned off manually with an environment variable if the
branch is expected to have missing dependencies:

ALLOW_MISSING_DEPENDENCIES=true
SOONG_ALLOW_MISSING_DEPENDENCIES=true (previous method)

That will be set automatically when using 'mm', which doesn't load the
entire build graph. It will also be set when using 'tapas' to build
unbundled apps, since those are usually on reduced branches.

This provides better error messages when a library is missing:

system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm64) missing libinit (SHARED_LIBRARIES android-arm64)
Available variants:
libinit (STATIC_LIBRARIES android-arm64)
libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm) missing libinit (SHARED_LIBRARIES android-arm)
Available variants:
libinit (STATIC_LIBRARIES android-arm64)
libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
build/core/main.mk:852: error: exiting from previous errors.

instead of:

ninja: error: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libinit_intermediates/export_includes', needed by 'out/target/product/generic_arm64/obj/NATIVE_TESTS/init_tests_intermediates/import_includes', missing and no known rule to make it

Test: Manually introduce errors, check for expected output
Test: multiproduct_kati on AOSP and internal master, no new breakages
Change-Id: I5847f813045929813214137403c499b44ef67907
Merged-In: I5847f813045929813214137403c499b44ef67907
/build/make/core/main.mk
31638ff73bcf09bcf941ddeab7f5a0390a9db406 04-Nov-2017 Colin Cross <ccross@android.com> Merge "Move BUILD_*_FROM_FILE to config.mk" am: ab5ce7e1fe
am: 9159f4b08c

Change-Id: Ib946129ef14cf91aa57a1fb880dae3f29adace63
e96bfdb3376141be04f7188f9305b627a8b7a469 03-Nov-2017 Colin Cross <ccross@android.com> Move BUILD_*_FROM_FILE to config.mk

BUILD_NUMBER_FROM_FILE and BUILD_DATETIME_FROM_FILE may need to
be referenced before main.mk has been parsed, move them to config.mk.

Bug: 68865363
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=Gallery
aapt dump xmltree out/target/product/generic/obj/APPS/Gallery_intermediates/package.apk AndroidManifest.xml | grep Version
Change-Id: I9361a394469e61fcdf5a2b9509ef2bb2b373d6e7
/build/make/core/main.mk
49415ab9b17371add3b0a413ddc02914bca58893 20-May-2017 bohu <bohu@google.com> emualtor: keep libopenjdkjvmti*.so on sdk images

BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: I28dad25eb61da424dcf87ab1f17277df340f9124
Merged-In: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
/build/make/core/main.mk
40be14c23945bf3b76eed6fbfbb97b01f035e2ef 21-Oct-2017 Colin Cross <ccross@android.com> Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f
am: 4ffa2e1ebc

Change-Id: I9ff0a8d8e2abd407935e691be324894a5da09f8c
bce301801f75e559c8a59b10b140b046ac6ca50d 21-Oct-2017 Colin Cross <ccross@android.com> Merge "Update references to build/core to build/make/core"
am: 6db8597174

Change-Id: I4be5bc1805d1900991966d24fda15f2705ee248d
6cdc5d20f346187a9926a7e9a2ccb07efc4ed3ff 20-Oct-2017 Colin Cross <ccross@android.com> Update references to build/core to build/make/core

sed -i -e 's"\([^/]\)build/core"\1build/make/core"g' $(git grep -l build/core)

Test: m checkbuild
Change-Id: Idf3a2fed79aee5d2c07bd8e42f0c0660f253ddc2
/build/make/core/main.mk
69ced5de5ec848f781956885c9bae52ea0106918 02-Oct-2017 Colin Cross <ccross@android.com> Delete jack support am: a6bc3a8a4c
am: 37bf2b1250

Change-Id: I19133aedbfe91f7cd49588b33f517dc4bb17b91c
e673deb2801626acdf4fa7d3517c4fac0e6a3bc6 27-Sep-2017 Colin Cross <ccross@android.com> Delete jack support

Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d732a04d07052217602790a3fec8208f8)
/build/make/core/main.mk
a6bc3a8a4cfaa272499503890bc73b82ba61d6cb 27-Sep-2017 Colin Cross <ccross@android.com> Delete jack support

Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d732a04d07052217602790a3fec8208f8)
/build/make/core/main.mk
35149ca0b786bb036399ab5f0a145d21c4c527ca 01-Sep-2017 Bo Hu <bohu@google.com> Merge changes from topic "aosp-emulator-oc"

* changes:
emulator: fix widevine drm vndbinder denial
emulator: fix selinux issues
emulator: squash misc modifications from oc-emu-dev
emualtor: keep libopenjdkjvmti*.so on sdk images
emulator: move rild.libpath to vendor
sdk:enable emulator to launch in build environment
build-emulator: fully treblize emulator image
Build vendor image for emulator
3db1d9b84a19758451c270c7f9339f5d473d7299 31-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Implement LOCAL_TARGET_REQUIRED_MODULES" am: 2c0442238b am: d7fe023444
am: 1923a31e9c

Change-Id: I05fc00b6ae97efcf8f11cabb334166e5355a2d83
d7fe0234444e1eb224157024fb63966788859bc2 31-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Implement LOCAL_TARGET_REQUIRED_MODULES"
am: 2c0442238b

Change-Id: Ifb9dccdde667dbbbe93bf9626fd9e0cf9f5f3152
b7e2fabe3881c3254d4172413a86dc4d0e92b040 20-May-2017 bohu <bohu@google.com> emualtor: keep libopenjdkjvmti*.so on sdk images

BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
Merged-In: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
/build/make/core/main.mk
9557cae873956c2b87dc82987b24fbb61dbdf610 30-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Implement LOCAL_TARGET_REQUIRED_MODULES

to allow a host module to specify LOCAL_TARGET_REQUIRED_MODULES
to indicate that the device module should be built.

Bug: b/64580523
Test: add "LOCAL_TARGET_REQUIRED_MODULES := \
CtsDeviceOsTestApp CtsHostProcfsTestApp" to \
cts/hostsidetests/os/Android.mk, run \
`m -j CtsOsHostSideTestCases`, check \
that CtsDeviceOsTestApp.apk was built

Change-Id: I1457a51f7cd922c059aa62955d8693b1a7539fd9
/build/make/core/main.mk
664484189e0624e594b6fe927368f3fe806e910b 23-Aug-2017 Dan Willemsen <dwillemsen@google.com> Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5 am: 57385f5ff1
am: 377e870b9e

Change-Id: I7d20339c9f6b8203ecc42108f7d38a25c517161f
377e870b9ea6afa2a9aa2dd4196ee5a2a395fee4 23-Aug-2017 Dan Willemsen <dwillemsen@google.com> Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5
am: 57385f5ff1

Change-Id: I44c20a2c3b51b4d33c3a09a192eef51059c543b4
514d49979c333257e6fe20153b047dafbdd02f03 25-Jul-2017 Dan Willemsen <dwillemsen@google.com> Split CleanSpec processing out of main Kati run

Bug: 35970961
Test: m clean; m nothing; m nothing
Test: Add CleanSpec.mk line, see it executing
Change-Id: Ied59ac9dbcbeec00e1ada8271b1f66cae33edb8d
/build/make/core/main.mk
9829f9a6076521ca2b11d10e3e5bbd63d969f806 18-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f am: b339102f67 am: 401b75c299
am: e05961ed95

Change-Id: Ib5ce6e22df36e1590333eb179ed33b1c44d12c88
e05961ed95d2bc55717e7088067928514c6cb510 18-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f am: b339102f67
am: 401b75c299

Change-Id: I02702cfafe58b6e6c249a37ee9e3ea3178d5bdcc
b339102f67aff921a0309940c69a97c620d97b9e 18-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Revert "Use the Finder's results for faster searching"""
am: 30928b0c6f

Change-Id: I8571745e8e37b87e5762438aff589f3132a3a428
30928b0c6f0e0d29fd58696bcd99e3e0920a77b0 18-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Revert "Use the Finder's results for faster searching"""
d05050ee9cc811466a6900e052a2506919d5963f 18-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Revert "Revert "Use the Finder's results for faster searching""

This reverts commit 6f2aea5636e62197c7938073ee52dace620e03c5.

Reason for revert: Fix went in ( I70b08023b94b5789dc8394651bbac4c49c82787f ); trying again to use this

Change-Id: I0f58c21a7312dda01980d338401e756f610fe3b4
/build/make/core/main.mk
46c9cfa1d13575fd3c5bf4bc5ed76b91e164d364 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58 am: 8467fba043 am: 12a4b403c2
am: 97079e0557

Change-Id: I19389b739e792372fa1d189d030c5a1d618b7b19
97079e05575f33b56eaf71f6ca38d9c03addf045 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58 am: 8467fba043
am: 12a4b403c2

Change-Id: I54466fe90cdab68e4c23cb09e2389ace494384ba
8467fba043cc653353b043144572626023beb945 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Use the Finder's results for faster searching""
am: 6df0626e58

Change-Id: I93d5c8df8500a5ea99751842b3585708e23fc251
6df0626e5802781954ca2794151e2d7b415ad8c7 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Revert "Use the Finder's results for faster searching""
6f2aea5636e62197c7938073ee52dace620e03c5 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Revert "Use the Finder's results for faster searching"

This reverts commit 4e3ea546d7f0d95def0a5788a143e9d82cfcf515.

Reason for revert: New Build Breakage: aosp-master/build_test @ 4283735

Change-Id: Icf62c628c1d0cb0b1fd4b401ae1a866f7f88c477
/build/make/core/main.mk
a92b602b4b2c34036adbec581fce686a4539011b 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Use the Finder's results for faster searching" am: 2d71b221cb am: 1b1997c028 am: 285812156b
am: b0839fc05b

Change-Id: Ib9341113134249f2978b2d59b75719e6f58bde02
b0839fc05b97baf98e663b20602d4ff28ac3c5eb 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Use the Finder's results for faster searching" am: 2d71b221cb am: 1b1997c028
am: 285812156b

Change-Id: I72fc55c1f915ae798fce870c1cdb50a22e9416e3
1b1997c0286b99057e50c4f419a3f2b2330ba7f5 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Use the Finder's results for faster searching"
am: 2d71b221cb

Change-Id: I4e78ca9eabeb8259be4a5996d53737719485d9df
2d71b221cb6c1f41e2ecd917fb9d45ce3affe85f 17-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Use the Finder's results for faster searching"
4a18f97b9d3f5d53b35f46d4ec4f89c37f538cbf 17-Aug-2017 Colin Cross <ccross@android.com> Merge "Sort files in directories passed to jar" am: 966ed15a1d am: 604a2423b6 am: da54a77928
am: 18c92897a7

Change-Id: I59d5bcd8557bac4ff176c3354dab556254ca3b85
18c92897a735363725759fb220d2df4b30738d8b 17-Aug-2017 Colin Cross <ccross@android.com> Merge "Sort files in directories passed to jar" am: 966ed15a1d am: 604a2423b6
am: da54a77928

Change-Id: I5cc539e58d655dbd1730acd368ad98071079a57d
604a2423b6e6b06c024f9a9f69c0703e75b4e5b7 17-Aug-2017 Colin Cross <ccross@android.com> Merge "Sort files in directories passed to jar"
am: 966ed15a1d

Change-Id: If01ba7d294e4308a28580b157b9efdb6c860bb35
128800f2c8d3f27d6ae29b9cb8e62cb26bcf5f2f 11-Aug-2017 Colin Cross <ccross@android.com> Sort files in directories passed to jar

jar -C <dir> . produces a jar containing files in filesystem order,
which can vary between builds. Manually find and sort the list of
files, and convert them into a list of -C <dir> <file> pairs.

Fixes: 64634025
Test: m -j checkbuild
Test: m -j out/target/product/sailfish/system/framework/ext.jar, check
that entries are sorted
Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac
Change-Id: I7dced6acbe621a60cd49daf17872941485602732
/build/make/core/main.mk
e5e0742444d0a6fc93c68b989d34215d12e30693 20-May-2017 bohu <bohu@google.com> emualtor: keep libopenjdkjvmti*.so on sdk images

BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
/build/make/core/main.mk
4e3ea546d7f0d95def0a5788a143e9d82cfcf515 04-Aug-2017 Jeff Gaston <jeffrygaston@google.com> Use the Finder's results for faster searching

Bug: 64363847
Test: m -j

Change-Id: Ie0905d8c5c54cd4c0c3b3edda6c3f1c4135ed7ed
/build/make/core/main.mk
19e0320ccbf31979fe48db7817898ff2150ae40d 01-Aug-2017 Alexey Polyudov <apolyudov@google.com> build: aux: Fix link type checking for AUX builds

AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.

1. Save enough of context in LINK_TYPE variable;
Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
building link_type rules

Bug: 62060489
Test: make auxiliary

build no longer tries to access "/STATIC_LIBRARIES" path

Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
(cherry picked from commit 55ebe631b4a50f940850323354241baab9d9be24)
/build/make/core/main.mk
f53b7b79c4d8304450084dce83a6f70792a9c789 02-Aug-2017 Alexey Polyudov <apolyudov@google.com> Merge "build: aux: Fix link type checking for AUX builds" am: 1e8c34b95f am: 7ed81ccadd
am: 1101804ca8

Change-Id: Ifb15bb2bdf5441e4e67f3009b956516b8c4a5b1d
7ed81ccadd52eebc161985b93e8e7b831aa139b5 02-Aug-2017 Alexey Polyudov <apolyudov@google.com> Merge "build: aux: Fix link type checking for AUX builds"
am: 1e8c34b95f

Change-Id: Icc2581867c1adad52b29d3ca7c68f08c89a906c0
55ebe631b4a50f940850323354241baab9d9be24 01-Aug-2017 Alexey Polyudov <apolyudov@google.com> build: aux: Fix link type checking for AUX builds

AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.

1. Save enough of context in LINK_TYPE variable;
Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
building link_type rules

Bug: 62060489
Test: make auxiliary

build no longer tries to access "/STATIC_LIBRARIES" path

Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
/build/make/core/main.mk
7f7faa1bea68b7accee21bd93cd75a2d3f5d418a 23-Jun-2017 Mathieu Chartier <mathieuc@google.com> Add product system server compiler filter property

The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

(cherry picked from commit 6a90210c62a76925827fd65f5e7e96318eb9ac5a)

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Merged-In: Id51726ae03576d7b4eb784b861158bb451c39deb
Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb
/build/make/core/main.mk
954551bb249d20ce8bfaf0a1e7e153221e6396db 29-Jul-2017 Mathieu Chartier <mathieuc@google.com> Merge changes Ic89cc4c0,I189cd144,Id51726ae,I8b777c88,Ia4573464, ...
am: dce396a70f

Change-Id: Id0d0ec4bc219b8fc0ce8b7bd13868d236b865153
6228ec2d0768ffd25f7e60e70b82d8b5a067e9f9 23-Jun-2017 Mathieu Chartier <mathieuc@google.com> Add product system server compiler filter property

The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

(cherry picked from commit 6a90210c62a76925827fd65f5e7e96318eb9ac5a)

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Merged-In: Id51726ae03576d7b4eb784b861158bb451c39deb
Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb
/build/make/core/main.mk
c1d097ccabe1e4c17196d85b2faf2be7677012fe 17-Jul-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3 am: 7ce0d9c1e7
am: a72da88c31

Change-Id: Ifba3d8ecec0aad8065f51525e68c3e2a7b6631fd
a72da88c31f547acc7bc8bae1d3b15a637b64f48 17-Jul-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3
am: 7ce0d9c1e7

Change-Id: Id57cc47edc61a7e30dc4fcf4f113ee9ce85a4b7f
6264b662f3ee7ff7b1addd980e88622aa65e1eb7 17-Jul-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Update to latest jacoco usage"
am: 483fae7430

Change-Id: Ibc94d5ba6db7690441825dd655b6cb26d989b78d
545c356675eac9592b300e59f40d206966cdbfca 15-Jul-2017 Dan Willemsen <dwillemsen@google.com> Merge "Enable missing dependency checks"
3cf0c9550245c64fc1af93fe3ccae8034a09ba9a 06-Jun-2017 Jeff Gaston <jeffrygaston@google.com> Enable SKIP_BOOT_JARS_CHECK by default when instrumenting

Bug: 36792868
Test: make -j EMMA_INSTRUMENT=true
Change-Id: I8f52418c97adc67c4c0a02ef8e2b84be620a6aee
/build/make/core/main.mk
aaae43cd242a56124431d82e4ecae41b870e6653 12-Apr-2017 Jeff Gaston <jeffrygaston@google.com> Update to latest jacoco usage

Bug: 36792868
Test: EMMA_INSTRUMENT_STATIC=true m -j

Change-Id: I419b543283b52be9a72f5c6b10e4cbea68782174
/build/make/core/main.mk
b945982cb3944f683c0808f59cdcbca39381314a 04-Jul-2017 Narayan Kamath <narayan@google.com> Merge "main.mk: Set dalvik.vm.stack-trace-dir"
de05f89bd3ff5d59297eb40ac594cbb2676d3eb6 18-Apr-2017 Dan Willemsen <dwillemsen@google.com> Enable missing dependency checks

With this enabled, we'll check the entire build graph for missing
dependencies -- even if you don't need to build the module. So it'll
present more errors, but surface them earlier.

These can be turned off manually with an environment variable if the
branch is expected to have missing dependencies:

ALLOW_MISSING_DEPENDENCIES=true
SOONG_ALLOW_MISSING_DEPENDENCIES=true (previous method)

That will be set automatically when using 'mm', which doesn't load the
entire build graph. It will also be set when using 'tapas' to build
unbundled apps, since those are usually on reduced branches.

This provides better error messages when a library is missing:

system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm64) missing libinit (SHARED_LIBRARIES android-arm64)
Available variants:
libinit (STATIC_LIBRARIES android-arm64)
libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm) missing libinit (SHARED_LIBRARIES android-arm)
Available variants:
libinit (STATIC_LIBRARIES android-arm64)
libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
build/core/main.mk:852: error: exiting from previous errors.

instead of:

ninja: error: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libinit_intermediates/export_includes', needed by 'out/target/product/generic_arm64/obj/NATIVE_TESTS/init_tests_intermediates/import_includes', missing and no known rule to make it

Bug: 37572490
Test: Manually introduce errors, check for expected output
Test: multiproduct_kati, no new breakages
Change-Id: I5847f813045929813214137403c499b44ef67907
/build/make/core/main.mk
6a90210c62a76925827fd65f5e7e96318eb9ac5a 23-Jun-2017 Mathieu Chartier <mathieuc@google.com> Add product system server compiler filter property

The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb
/build/make/core/main.mk
a7955c286e80e1cb327b927e95db57a80f82afba 23-Jun-2017 Dimitry Ivanov <dimitry@google.com> Enable linker warning toast for userdebug/eng builds
am: 7caea14111

Change-Id: I292da7d7d6b9f85a4108e8150a5e032fd5833e0a
7caea141115206b0d7b3e7e0c88e6a2f7f5b7455 20-Jun-2017 Dimitry Ivanov <dimitry@google.com> Enable linker warning toast for userdebug/eng builds

We did not want this to appear for dogfood devices before
because it was noisy, most of popular apps fixed this
problem and it should be much less noisy.

Bug: http://b/62455348
Test: make
Change-Id: Icd28e9ef87f2d1edf456d178741c67ef42670ae1
/build/make/core/main.mk
3487a6127d9271302bfa36da44f73b77c27b52ee 22-Jun-2017 Jiyong Park <jiyong@google.com> Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9
am: 9089f867d4

Change-Id: I3966676c72a0bb734da8c71765fc900fcfe85eb9
f1610d82f998adaaa493dc67b3e462fc3a4e9b07 22-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add LOCAL_OVERRIDES_MODULES"
fbba7fe06312241c7eb8c592ec2ac630e4316d55 25-Apr-2017 Narayan Kamath <narayan@google.com> main.mk: Set dalvik.vm.stack-trace-dir

... instead of dalvik.vm.stack-trace-file. Turns on the new
stack dumping scheme. Each dump is now output to a separate file.

Bug: 32064548
Test: Manual, unit tests included in other components.
Change-Id: I762b09148786e8533fd285d5bae0121ed46dfbe0
/build/make/core/main.mk
a236fa5d1271eae05c2fbe9e9bb292fd401de672 30-May-2017 Jeff Gaston <jeffrygaston@google.com> Merge "Add blueprint_tools as default target" am: 81787c1bbc am: 2cbed51e36
am: 61510fa696

Change-Id: I0c368aa1a12a8c670e2a459c7c7883f733608772
143f2b1fe5f3ec159308747e53a89d763f65fb69 27-May-2017 Jeff Gaston <jeffrygaston@google.com> Add blueprint_tools as default target

Bug: 38351765
Test: rm out -rf && m -j && stat out/soong/host/*/bin/bpfmt

Change-Id: I60ededa1b13fb575616162d6dc1b0b8159f97f20
/build/make/core/main.mk
118ceaea9a7dbed90f33bce432dbcb123d32a8de 27-May-2017 Dan Willemsen <dwillemsen@google.com> Merge changes I73787aff,I0d149812 am: 64caaf4679 am: 060e215f84
am: 6106d440c1

Change-Id: I509ee75ca9ee6c8dcacb839103d499bfe790dd23
562baccae895e641b7f1960d06e0dbdbc286218b 26-May-2017 Dan Willemsen <dwillemsen@google.com> Remove the rest of showcommands, dist goal

showcommands is all handled in soong_ui, make/kati/ninja never see the
argument.

Remove the dist goal, since we'll never pass it to ninja, only to Kati
as a modifier.

Remove DUMP_%, since that's not used anywhere (it appears to be in our
code search via the NDK build system)

Test: m -j showcommands dist
Change-Id: I0d1498128caece685e98c2c2b5b0c3f545da0e11
/build/make/core/main.mk
d1dd861edaa597ed1fce7b234b44c4136c969892 24-May-2017 Michael Schwartz <schwartzmi@google.com> Merge "Add ro.treble.enabled" into oc-dev
am: 84cbb4e903

Change-Id: Ic5120885ae16d5ed4c53dd3935e370fa5b0d7d05
50ecd4abf27ee486bef9d746e806fe0bc8ca7e68 24-May-2017 Dan Willemsen <dwillemsen@google.com> Merge "Move dataclean and installclean to soong_ui" am: 5d80b734f2 am: 303a902ac6
am: 5851c47ec0

Change-Id: I4b40be30baeb9a8f557c1900fc9e096f2fc0c1b3
5d80b734f2bd5f1c22b5d4400022e245cbeb3fe9 24-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Move dataclean and installclean to soong_ui"
c4aa4825011e7cd48d1d4fcf5bc100af16a92674 19-May-2017 Michael Schwartz <schwartzmi@google.com> Add ro.treble.enabled

Allow users to determine PRODUCT_FULL_TREBLE at runtime.

Bug: 36814984
Test: m -j sailfish and getprop ro.treble.enabled
Change-Id: I58515b1b3742062ae49358ed32bb02a5977e865d
/build/make/core/main.mk
841508562db9770684ba5323c242adfcf9fe7148 20-May-2017 Steven Moreland <smoreland@google.com> Merge "Add soong variable for PRODUCT_FULL_TREBLE." am: ec0dec8599 am: 7c318e8914
am: 094743b773

Change-Id: I3e44906669e251241b94029087040bdeab49c662
f32645f1f4603dfcc9a5913e07cd047afa7c8db8 19-May-2017 Steven Moreland <smoreland@google.com> Add soong variable for PRODUCT_FULL_TREBLE.

Required to preserve sane defaults for old codebases.

Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Merged-In: I0244fb02754663be3106391c9360fd1b2cc00d4a
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
/build/make/core/main.mk
2b32469c47378c3e655e0ef4057ce15a824b184a 19-May-2017 Steven Moreland <smoreland@google.com> Add soong variable for PRODUCT_FULL_TREBLE.

Required to preserve sane defaults for old codebases.

Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
/build/make/core/main.mk
0f2ab4603852855b046f99c035da42e51651c9a9 18-May-2017 Dan Willemsen <dwillemsen@google.com> Move dataclean and installclean to soong_ui

This can be a little faster, but also means that we don't need to call
kati/ninja twice when we need to handle the automatic installclean.

Test: m -j installclean
Test: m -j dataclean
Change-Id: I8f5e5544bcf30c58bf9abee30a37256cb18436ac
/build/make/core/main.mk
e74e77fe01f7f3f656343916d98e4ee20aa58367 16-May-2017 Dan Willemsen <dwillemsen@google.com> Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean' am: 212c418ee7 am: 39187e8882
am: c6f9429171

Change-Id: Iedcb0edf8d51ac18ddbfaa25e36e2a6a25299912
3eb44160e0b90d974d1415829dae87726838e44e 13-May-2017 Dan Willemsen <dwillemsen@google.com> Move version checking to soong_ui

This removes versions_checked.mk that caused kati to regenerate the
ninja file 3 times for a clean out directory. Kati needs to regenerate
every time that we write a file that we also read. soong_ui doesn't have
this problem.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: $OUT_DIR/versions_checked.mk no longer exists
Change-Id: I14b67dc275ea3daa77a7315c2985dc73d77fd07c
/build/make/core/main.mk
bd8ac3284d1b87805fc35c167e405c10652f66a3 13-May-2017 Dan Willemsen <dwillemsen@google.com> Move clean/clobber to soong_ui

So that we don't have to load up all the makefile state just to remove
the output directory.

Starting from a completely empty out directory:
kati: 16s
soong_ui: 2.0s

From a minimal out directory (m -j blueprint_tools):
kati: 3.8s
soong_ui: 0.4s

Test: m -j clean
Test: m -j clobber
Change-Id: Iec1ce032c7cc7ed102430080e857fc421b66309c
/build/make/core/main.mk
b16f288beed8b8bd51d323dbf94a3371dc4a420e 28-Apr-2017 Colin Cross <ccross@android.com> Make javac checkbuilds match jack

Building all java to dex is very slow. Make javac checkbuilds act
like jack checkbuilds and only build to class files for unused
modules, and add a java-dex target that can be used to build
everything to dex.

Bug: 33105206
Test: m -j checkbuild
Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
Merged-In: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
(cherry picked from commit 9eff830fa2484d531b3af670c51b061958b97e58)
/build/make/core/main.mk
5730186686fede6d3c66ee7e0777bb43c33feb64 03-May-2017 Colin Cross <ccross@android.com> Merge "Make javac checkbuilds match jack" am: cb8077df16 am: 9f1e58aab9
am: 2e2758b69d

Change-Id: I7d62da41492c2a4aae39d5f29b9b6086be9f58e6
cb8077df16f8506ee8352b948c5e2866f73d1d89 03-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make javac checkbuilds match jack"
9a1ba2e8b15fe8f9f7bcdf5b0e71d4b53ffb89cc 02-May-2017 Steven Moreland <smoreland@google.com> Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false." am: 0f56f197fa am: 05e43e6005
am: 28a13d0d9e

Change-Id: I72ed2d7ebbd7077d2377b4f0aa44ee8b0203cf56
0f56f197fab8d3c94df3cc76d7dfad1a50014011 02-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false."
3a0afa7f570276fc2e64e29ce49f562056843f0c 02-May-2017 Steven Moreland <smoreland@google.com> Allow PRODUCT_FULL_TREBLE_OVERRIDE to be false.

Devices which are not Android phones may want to set
PRODUCT_FULL_TREBLE_OVERRIDE (and therefore
PRODUCT_FULL_TREBLE) to false.

Test: confirm expected values when putting in expected values of:
PRODUCT_FULL_TREBLE_OVERRIDE
PRODUCT_SHIPPING_API_LEVEL
Fixes: 37869308

Change-Id: If5a383210ea282a3a274e5eba0d32ef6cfebafd0
/build/make/core/main.mk
9e7eab53c17441436199214bc2450eed4657d528 19-Apr-2017 Jaekyun Seok <jaekyun@google.com> Split vendor license notices into vendor partition

Xml files will be generated instead of html files, and then Settings
will generate html file on runtime from xml files of partitions.

Test: build succeeded and tested on sailfish
Bug: 37099941
Merged-In: Id7899381a537b1947cbb6164ed2b4a98492334af
Change-Id: Id7899381a537b1947cbb6164ed2b4a98492334af
(cherry picked from commit 3b7560bf881e6cd4579b984d3a1ebd9669513319)
/build/make/core/main.mk
035a49f3013c9a356cf904cfe2860a6a186bdba6 01-May-2017 Jaekyun Seok <jaekyun@google.com> Split vendor license notices into vendor partition
am: 3b7560bf88

Change-Id: Ib2926d1b97a5bdc9ef59738bd9e993487da0730d
9eff830fa2484d531b3af670c51b061958b97e58 28-Apr-2017 Colin Cross <ccross@android.com> Make javac checkbuilds match jack

Building all java to dex is very slow. Make javac checkbuilds act
like jack checkbuilds and only build to class files for unused
modules, and add a java-dex target that can be used to build
everything to dex.

Test: m -j checkbuild
Change-Id: Idcf9c9e0223b9dd88aaa53beb0cb50a230034b0f
/build/make/core/main.mk
3b7560bf881e6cd4579b984d3a1ebd9669513319 19-Apr-2017 Jaekyun Seok <jaekyun@google.com> Split vendor license notices into vendor partition

Xml files will be generated instead of html files, and then Settings
will generate html file on runtime from xml files of partitions.

Test: build succeeded and tested on sailfish
Bug: 37099941
Change-Id: Id7899381a537b1947cbb6164ed2b4a98492334af
/build/make/core/main.mk
db37b37afa1680507ddf9e35df11200ce71de7ec 26-Apr-2017 Narayan Kamath <narayan@google.com> Merge "Update stale comment for dalvik.vm.stack-trace-file." am: 5b50433f19 am: ba8e91ded3
am: 1898053ffb

Change-Id: Ibd01e7463a69995a31c721c1922a0fb7ce459a14
5b50433f19da5721d9ee978e0bbcaacbce511e3c 26-Apr-2017 Narayan Kamath <narayan@google.com> Merge "Update stale comment for dalvik.vm.stack-trace-file."
d5068605f91d28ad1bcc4fcd3c04dd7f0824ffa6 25-Apr-2017 Narayan Kamath <narayan@google.com> Update stale comment for dalvik.vm.stack-trace-file.

Test: make
Change-Id: Ia14494b146f58937aed203271be340747817519b
/build/make/core/main.mk
b50bbcc72a4e2edb569fe04ca0e325d8a40ac596 14-Apr-2017 Dan Willemsen <dwillemsen@google.com> Overridden packages shouldn't install vdex files either

Bug: 37348494
Test: internal marlin, check for WebViewGoogle.vdex
Change-Id: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
Merged-In: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
(cherry picked from commit e224725c956ea00d226a101c1a1d03fad6fb3da2)
/build/make/core/main.mk
4e9e5d526c4df580bd38d75bc10a661ebab7f305 20-Apr-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rewrite link type checking" am: e4d92ef568 am: d76aaed983
am: e834d5f059

Change-Id: I02342b80077a7e1e36e61d1f9384d3b104a982c1
b47d4e9cf12f734fa592ca1f9d093556d253cd38 08-Apr-2017 Dan Willemsen <dwillemsen@google.com> Rewrite link type checking

All the new features are turned off for now, since multiple branches and
products need to be verified before they can be turned on. So everything
should behave the same as today, except for no partition-based
warnings.

Instead of the current link type checks that happen during the build,
run as many as possible immediately after loading all the Android.mk
files. If we're allowing missing dependencies ('mm',
ALLOW_MISSING_DEPENDENCIES, tapas, etc), we'll defer the link type
checks to during the build. If we're not allowing missing dependencies,
we'll produce a better error message to the user about the missing
dependencies.

See core/main.mk for a description of the storage format.

This also remove the partition-based type checking. It hasn't worked all
that well, particularly with ASAN builds. The new VNDK checks will
handle the most pressing cases.

Test: Verify all link_type files and dependencies are the same:
grep link_type: out/build-aosp_arm64.ninja | sed -E "s/ rule[0-9]+//" | sort
Change-Id: Id643658b9d9e84f99f5db0d526aad88c1f5d3417
/build/make/core/main.mk
21ec75dbbefb316a389386c1c39d442b24795c16 15-Apr-2017 Dan Willemsen <dwillemsen@google.com> Merge "Overridden packages shouldn't install vdex files either" am: 01f4e20172 am: 5a8b1617ae
am: e78154614c

Change-Id: Iba7acc968fb9da65a418d3d94a8a50b9b3232bde
e224725c956ea00d226a101c1a1d03fad6fb3da2 14-Apr-2017 Dan Willemsen <dwillemsen@google.com> Overridden packages shouldn't install vdex files either

Bug: 37348494
Test: internal marlin, check for WebViewGoogle.vdex
Change-Id: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
/build/make/core/main.mk
1b2242895ea1538b094a54be3100880f92bd2bb2 30-Mar-2017 Jaekyun Seok <jaekyun@google.com> Use product-based inclusive rule for enforcing RRO

Board-based rule can cause unexpected regression because build-time overlays
are different among products. So each product should be tested with its own
product-based rule considering its build-time overlays before applying
enforcing RRO.

Additionally RRO conversion is mandatory only for overlays of which target is
included in AOSP system image and is critical for CTS/VTS tests with AOSP
system image. So inclusive rule is more suitable instead of exclusive rule
to avoid unexpected regression due to unnecessary RRO conversion.

Note that we still support conversion for all the overlays by specifying
PRODUCT_ENFORCE_RRO_TARGETS as "*".

Test: building succeeded and tested with auto-generated RROs.
Bug: 36231603
Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
(cherry picked from commit 2a209997e8b4eee2b4571d569b1995f29b8e111d)
/build/make/core/main.mk
2a209997e8b4eee2b4571d569b1995f29b8e111d 30-Mar-2017 Jaekyun Seok <jaekyun@google.com> Use product-based inclusive rule for enforcing RRO

Board-based rule can cause unexpected regression because build-time overlays
are different among products. So each product should be tested with its own
product-based rule considering its build-time overlays before applying
enforcing RRO.

Additionally RRO conversion is mandatory only for overlays of which target is
included in AOSP system image and is critical for CTS/VTS tests with AOSP
system image. So inclusive rule is more suitable instead of exclusive rule
to avoid unexpected regression due to unnecessary RRO conversion.

Note that we still support conversion for all the overlays by specifying
PRODUCT_ENFORCE_RRO_TARGETS as "*".

Test: building succeeded and tested with auto-generated RROs.
Bug: 36231603
Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
/build/make/core/main.mk
39f97ae22a44adc1ce0542056ffa02cec1b21a48 01-Feb-2017 Jaekyun Seok <jaekyun@google.com> Enforce RROs for all the build-time ROs

This CL is to generate every static RRO package for its target package
automatically at build-time.

BOARD_ENFORCE_RRO build variable is added to specify whether enforcing
RRO is required or not.

BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify
the module list of which item should be exempt from enforcing RRO.

Test: tested on bullhead and sailfish
Bug: 34097942
Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
(cherry picked from commit 3070610b729e695668a9d93e546907903956a74d)
/build/make/core/main.mk
cbf76f63533a6b46d6ffe59346b1e4a71ebdcdb6 24-Mar-2017 Jiyong Park <jiyong@google.com> Add LOCAL_OVERRIDES_MODULES

LOCAL_OVERRIDES_MODULES is similar to LOCAL_OVERRIDES_PACKAGES, but is
for executables.

Bug: 36491275
Test: LOCAL_OVERRIDES_MODULES := foo should prevent a target executable
foo from being installed. If foo is not a target executable, error
should be reported.

Change-Id: I558f3d94105f9e319f8413c1290799f1c70ee131
/build/make/core/main.mk
19453bfe7dd246eaf48bd5d3fe692540088944b8 21-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for system props split (2)"
04a168f86b05ddb27ce7fa1f8a610691370eea47 21-Mar-2017 Jaekyun Seok <jaekyun@google.com> Use BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for system props split (2)

http://ag/1955051 is already submitted for the same purpose, but this
was missed from it.

Test: building succeeded and tested with sailfish
Bug: 34116668
Change-Id: I662b68d5b07e65bfdcf41fcd0782640582246318
/build/make/core/main.mk
6be7d01e057435de0fb3a38b8c36f7be828a04db 21-Mar-2017 Dan Willemsen <dwillemsen@google.com> Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a am: 35bdbdfdc3
am: 0a5905c139

Change-Id: I74719ac53bd7c477c71e3680657139d7dfa9db5c
25e9607a46670067188fda02459d002d3b4224af 02-Mar-2017 Dan Willemsen <dwillemsen@google.com> Remove USE_SOONG_UI=false

Test: m -j
Change-Id: I4eccbf9884385f11db84f6e0f28d55d21d06cac3
/build/make/core/main.mk
3070610b729e695668a9d93e546907903956a74d 01-Feb-2017 Jaekyun Seok <jaekyun@google.com> Enforce RROs for all the build-time ROs

This CL is to generate every static RRO package for its target package
automatically at build-time.

BOARD_ENFORCE_RRO build variable is added to specify whether enforcing
RRO is required or not.

BOARD_ENFORCE_RRO_EXEMPT_SOURCES build variable is added to specify
the module list of which item should be exempt from enforcing RRO.

Test: tested on bullhead and sailfish
Bug: 34097942
Change-Id: I455b2ce34e66c57a540c299b5e378b7c4e78d5b8
/build/make/core/main.mk
5a9cfecc8565d2ef8a442abe9c4c2e1927665feb 02-Mar-2017 Steven Moreland <smoreland@google.com> Merge "Add PRODUCT_FULL_TREBLE." am: 5236e11c54 am: 848e9430bc
am: e1de7cd45a

Change-Id: I335f68e8d49538a7539cfb2e751d2c34cb52e260
c10f1413d5b64e5c86eed8ac1dbe49add42160c8 01-Mar-2017 Steven Moreland <smoreland@google.com> Add PRODUCT_FULL_TREBLE.

PRODUCT_FULL_TREBLE: whether the device has Treble fully enabled (no
passthrough hals, vendor.img, split sepolicy, etc..)

PRODUCT_FULL_TREBLE_OVERRIDE: used if someone wants to consider a device
as full Treble even if it didn't launch with Android O.

Bug: 35809750
Test: PRODUCT_FULL_TREBLE set appropriately with
PRODUCT_FULL_TREBLE_OVERRIDE and PRODUCT_SHIPPING_API_LEVEL = 24/25

Change-Id: I069448beaf26c70acb6c45d4228d8fdfe9476410
/build/make/core/main.mk
3571f256a2b42ab0764a9777f01eac1596739edd 28-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge "Turn USE_SOONG_UI on by default" am: 39a6418d76 am: d9b773845d
am: 1614715054

Change-Id: I634496e0b0887e18fa39be5b8fb380d3780b4f17
73da612ed0aed765db63a1a8f3fce41303c16fa3 28-Jan-2017 Dan Willemsen <dwillemsen@google.com> Turn USE_SOONG_UI on by default

Set USE_SOONG_UI=false to disable the new soong_ui wrapper.

Test: m -j blueprint_tools
Test: USE_SOONG_UI=false m -j blueprint_tools
Change-Id: I0b217939a29fd51e69ef594f824b14e25a4c8c4d
/build/make/core/main.mk
433e7e4d451a6b1f3db6334d47dfdbe714ae2954 24-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge "Add progress indicator to Android.mk includes" am: 353a659a31 am: 100edc4a4c
am: d2445ea0b2

Change-Id: Ib60190f62fc78e261b6d02287bf8f68891bd7d12
353a659a31fb3d4d366172304cb1c48b457631d1 24-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge "Add progress indicator to Android.mk includes"
a7886dc417249a397cf50a5bfa1a4e88a0914af7 22-Feb-2017 Simran Basi <sbasi@google.com> Merge "Add device-tests and general-tests make targets." am: c436f9eeec am: 0d0f7e1c7b
am: c1eb9a69c8

Change-Id: I6288642e2dcfa7210605030e968dae4122c8deb6
33631b3580d4b63e72ab81f0790bb14aab2b7854 18-Feb-2017 Dan Willemsen <dwillemsen@google.com> Add progress indicator to Android.mk includes

Test: m -j
Change-Id: I1e6fd020a06b49c243be14953d9f417e64ac7b8b
/build/make/core/main.mk
9c295b4415a0d91adc9e6c49b20ab60dc1644092 16-Feb-2017 Simran Basi <sbasi@google.com> Add device-tests and general-tests make targets.

Adds the device-tests and general-tests makefiles and
added include lines to main.mk so that individual test
modules can be built properly.

These targets do not build any special tradefed wrapper
that normal *TS's usually employ. They are not necessary
here.

Bug: 35350788
Test: Updated several CTS test modules to belong to these
suites instead and ran:
`rm -rf out; make clean; make device-tests general-tests -j`
then verified the output.

Change-Id: I40e3958375f7b39cb56508f2812ce9760d403f6f
/build/make/core/main.mk
44d4e9c84490bbe66ce458e9aa4db7897aa7520e 13-Feb-2017 Colin Cross <ccross@android.com> Merge "Don't build tests in normal builds" am: 4bf332a56b am: d364511ce7 am: 3ad23fd09e
am: 762c8f0ba3

Change-Id: Ifa05ce9bf30e504b7dc606c34f2afb3037b7806b
4bf332a56bb5f18c4def5a81e2def79a3482b800 13-Feb-2017 Colin Cross <ccross@android.com> Merge "Don't build tests in normal builds"
d326af8253bd24848be96c03650c99d5f8bec40c 09-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge "Fix "Nothing to be done" messages when launching soong_ui" am: 576c76160b am: b7075868bd am: 990bcc985a
am: 05b6cf7516

Change-Id: I4e6049827c80cacf90b71bdfc36a8e4c389c8c87
c5bb5a8238a1cc573ee0054004b518be10d7a5b3 09-Feb-2017 Dan Willemsen <dwillemsen@google.com> Fix "Nothing to be done" messages when launching soong_ui

When specifying multiple arguments to make, we were getting messages
about nothing to be done:

m -j USE_SOONG_UI=true checkbuild tests cts blueprint_tools
...
make: Nothing to be done for `tests'.
make: Nothing to be done for `cts'.
make: Nothing to be done for `blueprint_tools'.

Test: m -j USE_SOONG_UI=true blueprint_tools libc adb
Change-Id: Id448bf0e09736fcd92ba058aec7ce556f6f778a3
/build/make/core/main.mk
d0a11311e94c2478c919a57a2a20029b357f84e8 07-Feb-2017 Dan Willemsen <dwillemsen@google.com> Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916 am: 807f6927c7 am: b2d74278a7
am: 9c2e892f4c

Change-Id: Ibf9b9a2b8ba9c24a4110c94d9c2792023d065684
3eb10cf6fa577f0233982ab5bdd394cf8131bb77 06-Sep-2016 Dan Willemsen <dwillemsen@google.com> Add USE_SOONG_UI to trigger soong_ui in Make mode

Test: USE_SOONG_UI=true m -j
Change-Id: Ic7a0b4e0881757b0324722d7d316fb8d13dabd9b
/build/make/core/main.mk
8bee120006d5ffd07a857cc72dd67cdc98e81067 31-Jan-2017 Jaekyun Seok <jaekyun@google.com> Split vendor's system prop overrides into vendor partition

If ENABLE_TREBLE and early mount of vendor partition are enabled,
overrides in PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be stored in
vendor/default.prop.

If ENABLE_TREBLE and vendor partition are enabled, overrides in
PRODUCT_PROPERTY_OVERRIDES will be stored in vendor/build.prop.

default.prop of recovery image will include all the contents of
vendor/default.prop and vendor/build.prop additionally.

ENABLE_EARLY_MOUNT is added to specify whether early mount is enabled
or not, but it should be removed later when early mount becomes
default for all ENABLE_TREBLE products.

Test: building succeeded, and verified on bullhead.
Bug: 34116668
Change-Id: Ic2eb8882ae71921a76c02b3d62d3289c45949295
/build/make/core/main.mk
7ace0d60ef59bb5d5ff0b22d51d3a85b626eaa0c 20-Jan-2017 Jaekyun Seok <jaekyun@google.com> Prevent abuse of property overrides

To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.

- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
files.

Test: building succeeded on marlin-userdebug.
Bug: 34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
(cherry picked from commit 294286d95c7647c1c20c3537f065c21e85371695)
/build/make/core/main.mk
294286d95c7647c1c20c3537f065c21e85371695 20-Jan-2017 Jaekyun Seok <jaekyun@google.com> Prevent abuse of property overrides

To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.

- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
files.

Test: building succeeded on marlin-userdebug.
Bug: 34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
/build/make/core/main.mk
cf324af6b886a0d9f9ef8cff96be34b6927167f2 22-Dec-2016 Dan Willemsen <dwillemsen@google.com> Remove generated java source post clean logic

Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.

Bug: 30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
/build/make/core/main.mk
7a14ec7968d6a65b12310731f4556893874c52b7 21-Dec-2016 Colin Cross <ccross@android.com> Don't build tests in normal builds

Treehugger will catch test breakages before they are submitted, it
is no longer necessary for all developers to wait for all tests to
build.

Test: m -j
Bug: 32221202
Change-Id: Ia1ed939fa28a80df10248b9f5c2f298b1e5d2053
/build/make/core/main.mk
56c6a9d1ffc75b47228a97fb87fef4e0110e83bc 15-Dec-2016 Dan Willemsen <dwillemsen@google.com> Remove variables exported by Soong

LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading. LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.

Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.

Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
/build/make/core/main.mk
01a19a116f69c0545ee8382316dfbf3e2e7f4475 10-Nov-2016 Dan Willemsen <dwillemsen@google.com> Move some configuration from main.mk to config.mk

When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.

Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk

Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.

Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
/build/make/core/main.mk
e402dd8bb81ed5f5d7b803ad090e23a89ee90db5 30-Oct-2016 Colin Cross <ccross@android.com> Merge "Revert "Revert "Check prebuilt sources during checkbuild"""
am: 515f43bb6e

Change-Id: Ia749b34011e02df8ceb9d0fe0e4aba34da743cb1
01e1b8ff4b8d020f1fcdbd61910f461375b46025 28-Oct-2016 Colin Cross <ccross@android.com> Revert "Revert "Check prebuilt sources during checkbuild""

This reverts commit 409ea88c4797a56b918ad02ebef0d2b1e7c57748.

Bug: 32332829
Change-Id: Ifc8a511762cb44b455cc821f5ac712c294c321c6
/build/make/core/main.mk
96fdb76947a89e9a9c75f5a064a2bbb990c7e799 27-Oct-2016 Colin Cross <ccross@android.com> Merge "Revert "Check prebuilt sources during checkbuild""
am: 526ddfb172

Change-Id: I2bd28f5b35b27e2339eb2952b9e3acdd6a470773
409ea88c4797a56b918ad02ebef0d2b1e7c57748 27-Oct-2016 Colin Cross <ccross@android.com> Revert "Check prebuilt sources during checkbuild"

This reverts commit ec8fae6f2e11a772fa97fe6baf895222f7ffdf5d.

Revert this until a few oddball branches can be fixed.

Bug: 32332829
Change-Id: Ic95fa50e36cb32a4d29bf765b1f3d8384140fb0b
/build/make/core/main.mk
84ba353fd13285a7cb5c0cef54b2a402348631f5 26-Oct-2016 Colin Cross <ccross@android.com> Merge "Check prebuilt sources during checkbuild"
am: 0f26c64ef5

Change-Id: I961221a3e7cdcd00ea4dcbb1c88a36f138962113
ec8fae6f2e11a772fa97fe6baf895222f7ffdf5d 21-Oct-2016 Colin Cross <ccross@android.com> Check prebuilt sources during checkbuild

Add prebuilt files as dependencies during checkbuild. This will flag
prebuilt modules that have files that don't exist as errors, and also
fix building soong modules with make native, etc.

Bug: 32332829
Test: m -j checkbuild
Test: m -j host
Change-Id: Ia4e22cb640978c181de039202baf02f4fb5a94d5
/build/make/core/main.mk
829ab04c9b958562eeaca45ec38bcc9eb1f6376d 07-Oct-2016 Dan Willemsen <dwillemsen@google.com> Merge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc am: 9d2208441c
am: 34d8c31258

Change-Id: Idc49bb5ad4890c368762cd73ac34e995b2633d1d
c1f17ffc7d4fa6225274b9f8007d6f7fae03ab08 06-Oct-2016 Dan Willemsen <dwillemsen@google.com> Replace product variable stashing with .KATI_READONLY

Instead of using rot13 / rot26, use the Kati extension to mark these
variables as readonly.

Move $(strip) for a few variables to before they're marked readonly. Use
a different variable for modifications to BOARD_KERNEL_CMDLINE in
build/core/Makefile.

Test: build/tools/kati_all_products.mk on AOSP and internal master
Test: build-aosp_bullhead.ninja the same before / after
Change-Id: If98b24af763831a9c5c2de38037a69ab1bf9e023
/build/make/core/main.mk
46e7aa81e0e91e29a3fec9f46a2cfced9f49c99b 04-Oct-2016 Colin Cross <ccross@android.com> Merge "Enable toc optimization for host builds" am: 5d8c73e373 am: 4276c12d20
am: e4e04c2f92

Change-Id: I4db91a8f0893faa317ec7afb2e3f5d84dfcc91cf
d2ff15715976bcb0179518565de134508236b5c2 04-Oct-2016 Colin Cross <ccross@android.com> Enable toc optimization for host builds

The toc optimization had been disabled for host builds to ensure that
the timestamp of the final binary changed whenever its implementation
changed, in order to support rerunning host tools that were modified
during incremental builds. However, only the final install rule must be
re-run to update the timestamp, and not the link rule.

Update the shared library install dependencies to use normal
dependencies instead of order-only dependencies for host modules, and
then enable the the toc optimization for host modules. If the
implementation of a library changes it will be reinstalled, and
libraries or binaries that depend on it will also be reinstalled.

Bug: 26015464
Test: m -j; touch art/disassembler/disassembler_x86.cc; m -j, verify
out/host/linux-x86/bin/oatdump is updated
Change-Id: I0a14decc1994eb55ad269d841943aef66e320c63
/build/make/core/main.mk
27ac0e34fec282656853e5a1be34a20fbe36e3b6 29-Sep-2016 David Zeuthen <zeuthen@google.com> resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp

Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb
2ce63edab715ae4ff34e1a2ef240b05216f6ca5d 15-Sep-2016 David Zeuthen <zeuthen@google.com> Update for new Android Verified Boot (AVB).

This updates the build system for the new Android Verified Boot
codebase. As this is based on Brillo Verified Boot, this change replaces
the existing BVB support.

Android Verified Boot is enabled by the BOARD_AVB_ENABLE variable

BOARD_AVB_ENABLE := true

This will make the build system create vbmeta.img which will contain a
hash descriptor for boot.img, a hashtree descriptor for system.img, a
kernel-cmdline descriptor for setting up dm-verity for system.img and
append a hash-tree to system.img.

Additionally, the descriptors are left in boot.img and system.img so a
third party can create their own vbmeta.img file linking - using the
option --chain_partition - to these images. If this is not needed
footers can be erased using the 'avbtool erase_footer' command. It's
also harmless to just leave them in the images.

By default, the algorithm SHA256_RSA4096 is used with a test key from
the AVB source directory. This can be overriden by the
BOARD_AVB_ALGORITHM and BOARD_AVB_KEY_PATH variables to use e.g. a
4096-bit RSA key and SHA-512:

BOARD_AVB_ALGORITHM := SHA512_RSA4096
BOARD_AVB_KEY_PATH := /path/to/rsa_key_4096bits.pem

To prevent rollback attacks, the rollback index should be increased on a
regular basis. The rollback index can be set with the
BOARD_AVB_ROLLBACK_INDEX variable:

BOARD_AVB_ROLLBACK_INDEX := 5

If this is not set, the rollback index defaults to 0.

The variable BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS can be used to specify
additional options passed to 'avbtool make_vbmeta_image'. Typical
options to be used here include '--prop', '--prop_from_file', and
'--chain_partition'.

The variable BOARD_AVBTOOL_BOOT_ADD_HASH_FOOTER_ARGS can be used to
specify additional options passed to 'avbtool add_hash_footer' for
boot.img. Typical options to be used here include '--hash_algorithm' and
'--salt'.

The variable BOARD_AVBTOOL_SYSTEM_ADD_HASHTREE_FOOTER_ARGS can be used
to specify additional options passed to 'avbtool add_hashtree_footer'
for systems.img. Typical options to be used here include
'--hash_algorithm', '--salt', and '--block_size'.

BUG=31264226
TEST=Manually tested on edison-eng by inspecting {boot, system,
vbmeta}.img in out/ directory as well as their counterparts in
the IMAGES/ directory of edision-target_files-eng.zeuthen.zip

Merged-In: Ic9a61cfc65c148b12996e57f04da5432eef6b982

Change-Id: I97042655bca15e7eac899f12c5bada2f6184d307
/build/make/core/main.mk
83aba3a7ab401207d703880da10042d462bfef7e 20-Sep-2016 Dan Willemsen <dwillemsen@google.com> Merge "Fix link_type checking" am: 665cda08f0 am: 1347d959de
am: 8459bbca6f

Change-Id: I22da0f1703995c4734a72901abe2dbcee62c1406
121e284b460afc3603b88883563ad3156aa2de4d 15-Sep-2016 Dan Willemsen <dwillemsen@google.com> Fix link_type checking

This was printing "error:", but not actually triggering an error.
Instead of trying to write a single line bash script to handle this,
move the actual check into python. This allows us to print all of the
errors for a single module before triggering the failure.

Also updates the warning format and the warn.py script to properly parse
these warning. Many of the java:sdk -> java:platform warnings are false
positives due to the lack of LOCAL_SDK_VERSION markings on prebuilts.

Individual tags can be marked as warnings now, which lets us check for
system libraries linking against vendor libraries (which won't work on
AOSP). I'm not sure this is a completely valid check, which one reason
that it's just a warning.

Test: m all_link_types (with some missing libs commented out)
Change-Id: I333e418c9a4511b7c7e826891ae481da08fbf6f9
/build/make/core/main.mk
196f19059260124c204c9013d5182f1c5e9304b4 14-Sep-2016 Dan Willemsen <dwillemsen@google.com> Merge "Fix shared library install dependencies outside of /system" am: 0b3f97b0d6 am: f9fc0ea6fe
am: 7c4ced5337

Change-Id: Ibc3c3fca687f7541d779d390e3cbc6123f88e149
5bdd08b2d9b98b0c938262070ae817d9cd17709c 13-Sep-2016 Dan Willemsen <dwillemsen@google.com> Fix shared library install dependencies outside of /system

For properly picking the shared library install dependencies, HOST_OUT
and HOST_CROSS_OUT are necessary so that we don't add a dependency
between Linux and Windows. But for target modules, we must use
TARGET_OUT_ROOT instead of TARGET_OUT, or modules in /data and /vendor
won't have proper install dependencies.

Bug: 31462199
Test: m bionic-unit-tests; manual diff of generated ninja file
Change-Id: I828fa2664613296cc6c431813f5657abffdd2b8f
/build/make/core/main.mk
5a63fe68565824904d5adb153e48d299e675fb6b 13-Sep-2016 Ryan Campbell <ryanjcampbell@google.com> Merge "Implement path-based enabling of code coverage." am: 1e1ecd5d07 am: 6b92bb4ebb
am: 577eab3323

Change-Id: I36a4fc67e87e8561486111263b0d6b6ed1bdefcc
81c9d29dad68618718b0418cb749c571ad362333 12-Sep-2016 Ryan Campbell <ryanjcampbell@google.com> Implement path-based enabling of code coverage.

Native coverage is enabled by setting NATIVE_COVERAGE to true
and specifying a list of paths in the COVERAGE_PATHS
environment variable. Files are exported to a zip file in the
target out directory.

Change-Id: I66a2ddd88e849bec1cc0cdae1b51fe18a007e2c3
/build/make/core/main.mk
7d72b5ef7198777a837bac66eafa2816eab4d7d0 15-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d am: 9fc9cac0ac
am: 0e642c3e55

Change-Id: Ic608a11b5b7ccf78f75bbf4ce7086ed92e1b9e14
9fc9cac0ac41e37c335cd7062fb3f64bab201d00 15-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Fix GET-INSTALL-PATH to work with Soong"
am: 6b9aa6938d

Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
53e3899222a7c49721e5b2be13cadbbf3b66c721 12-Aug-2016 Dan Willemsen <dwillemsen@google.com> Fix GET-INSTALL-PATH to work with Soong

This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.

Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
/build/make/core/main.mk
74140b99c49d959ba23020a84a8a95f5a6c7cb60 03-Aug-2016 Alexey Polyudov <apolyudov@google.com> Merge "introduce AUX build class of targets" am: 556526bf95 am: 755391d77e
am: 30937fbde2

Change-Id: I73aa67afa95b8c45c5a4e310a340bc709d0b3da0
755391d77e248b238bf2412b045490a0d6db6835 03-Aug-2016 Alexey Polyudov <apolyudov@google.com> Merge "introduce AUX build class of targets"
am: 556526bf95

Change-Id: I52b4b3a561ceb9c1fbe71ce75a4ef4aa252a9665
ccdc311b3328166687b2b3098059d50f1e8ff6e9 02-Aug-2016 Alexey Polyudov <apolyudov@google.com> introduce AUX build class of targets

AUX is a new class, similar to TARGET
While TARGET defines toolchain for Application Processors
AUX is defining toolchains for arbitrary utility cores (DSPs, GPUs,
MCUs, etc). This allows building of non-android sources as part
of Android tree and avoid using prebuilts if source code is avaliable

Bug: 29635686
Change-Id: Ie755ea054b16c3e86369f5fb2ba6eb0b384af77f
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
/build/make/core/main.mk
dee194df54fd19feafd2464f4d86aaded67171a4 28-Jul-2016 Dan Albert <danalbert@google.com> Merge changes from topic \\\'soong-sysroots\\\' am: 65de8e446c am: 01efd46bca
am: cce7b4f00a

Change-Id: Ia5f4f59a5d53c852905a50f1a54d1ec3b9e6e2a7
01efd46bca22e08ff408598e5dfeedab08c18e57 28-Jul-2016 Dan Albert <danalbert@google.com> Merge changes from topic \'soong-sysroots\'
am: 65de8e446c

Change-Id: I8c8951364c5ddd6f99a27111acdb72097ab5db42
c61174aac16995d9c56a5ee91e99c7df2d0f27df 28-Jul-2016 Dan Albert <danalbert@google.com> Add a phony target for the NDK sysroots.

`make ndk` will build all the NDK sysroots.

Test: make ndk
Bug: http://b/27533932
Change-Id: Ic2f5bf61f8911f7b8d08a473f2fe0576f3e06224
/build/make/core/main.mk
64755b9ec502e3031677c68cd257ae653987628c 12-Jul-2016 Colin Cross <ccross@android.com> Merge \\\"Remove Android.bp logic from makefiles\\\" am: 8bc18d35ec am: 7dc26e8aa8
am: 95ebfddd5f

Change-Id: I22073f2e6788db034f7a904600100d590efec272
7dc26e8aa8431a5a8b3d3d7d05c1891b66c615b8 12-Jul-2016 Colin Cross <ccross@android.com> Merge \"Remove Android.bp logic from makefiles\"
am: 8bc18d35ec

Change-Id: I50c8180c8297feb48ff5c5eba10670b36f631921
65543c7bc2bfb5b9de0b52a9568fec5d9ae93ff7 12-Jul-2016 Colin Cross <ccross@android.com> Remove Android.bp logic from makefiles

When Soong was optional, the make build system needed extra complexity
to ignore Android.mk files that had an associated Android.bp file. Now
that Soong is required and the Android.mk files that were obsoleted by
an associated Android.bp file have been removed, remove all of the logic
that found associated Android.bp files. Android.mk files and Android.bp
files are now handled independently.

Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35
/build/make/core/main.mk
a3e8e9c6f33ecd57221b7fe0ab1bf9c5035351ed 30-Jun-2016 Alex Light <allight@google.com> resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp

Bug: 29278988

Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d
4e358ab2c3635439db5bd1a1ef424d5c1250ce00 16-Jun-2016 Alex Light <allight@google.com> Add system_other partition, install odex files

For AB devices, support flashing two system partitions for factory use.
The normal system image on one partition, but without dex preopt. And a
system_other image that just contains the odex files. The dex files will
not be stripped out of the system image, in case the second system
partition is wiped.

Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk
enables this behavior.

One can control which directories are placed in system_other by the
SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default
to only copying only app and priv-app odexs.

Bug: 29278988
Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
/build/make/core/main.mk
32b36a88198b9e9f44c22d9103d67530ab0d8940 07-Jun-2016 Dan Willemsen <dwillemsen@google.com> Merge "Add NATIVE_TESTS class, move host native tests" am: e72fc63901
am: 10461b78f0

* commit '10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
Add NATIVE_TESTS class, move host native tests

Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
e72fc639014809b4d4239d7f7754c6950f1ad546 07-Jun-2016 Dan Willemsen <dwillemsen@google.com> Merge "Add NATIVE_TESTS class, move host native tests"
888a6238810b4c3c00108cb92f9755e74acd9ecf 17-May-2016 Daniel Micay <danielmicay@gmail.com> disable unpriv perf by default in user{,debug} builds

(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
/build/make/core/main.mk
3728ebcfafccca097e9e87413bda4557ce1fbfd8 02-Jun-2016 Jeffrey Vander Stoep <jeffv@google.com> Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98
am: 13f2b4cf2f

* commit '13f2b4cf2f9ec4e17bedf75b01263b88d08982d6':
disable unpriv perf by default in user{,debug} builds

Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
4bc8280a9886d93870fab02eea73986d8ca08965 02-Jun-2016 Jeffrey Vander Stoep <jeffv@google.com> Merge "disable unpriv perf by default in user{,debug} builds"
01437aa5d331c3cfe75839ff05f66412cc45f1f4 01-Jun-2016 Colin Cross <ccross@android.com> Merge "Update Android.mk finder to work with Android.bp files" am: 520442f053
am: 18023b557b

* commit '18023b557b6d33836de380df397fce10598931a9':
Update Android.mk finder to work with Android.bp files

Change-Id: I87915d75c3bda9c41c926a7c8ad7c650ac085199
f2ac912b19ccbcc15d5176ec52c99744810adce7 17-May-2016 Daniel Micay <danielmicay@gmail.com> disable unpriv perf by default in user{,debug} builds

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
/build/make/core/main.mk
4cbf8eb9f547feba370fe77e67e2d629bb41d455 28-May-2016 Colin Cross <ccross@android.com> Update Android.mk finder to work with Android.bp files

The Android.mk finder should stop traversing when it finds an Android.bp
file, and any Android.soong.mk file at the same path should be included.

Update filter-soong-makefiles to accept a mixed list of Android.bp files
and Android.mk files, convert Android.bp files to Android.soong.mk files
if they exist, and ignore Android.mk files that have an Android.bp file.

Update first-makefiles-under to use the new --dir syntax for
findleaves.py and search for both Android.bp and Android.mk files.

Update all-makefiles-under and all-named-subdir-makefiles to search for
both Android.bp and Android.mk files.

Change-Id: Iddc51bf84593d5de3add02f2b2c065da08962af4
/build/make/core/main.mk
6f8244b62dbaa6da40c7914c0d4e94ed53e226ac 27-May-2016 Colin Cross <ccross@android.com> Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624
am: 323396993c

* commit '323396993c6651b4b98974df9e9d53118f27a840':
Fix mm and mmm in Android.bp directories

Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
8642525726b3f3d11e64d0abf52af803f4e308ce 27-May-2016 Colin Cross <ccross@android.com> Fix mm and mmm in Android.bp directories

mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.

Bug: 28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
/build/make/core/main.mk
44cf069b301e8fcac1526255e1485307e8703188 26-May-2016 Colin Cross <ccross@android.com> Merge "Remove USE_SOONG=false option" am: 5413fb4b3e
am: a36de73331

* commit 'a36de73331b92e5e75ba92e7a4707e5850e3486d':
Remove USE_SOONG=false option

Change-Id: Iba393dadd32a55e910cf0ab980a1e82887f60bb9
a61d672529a11b336309a412d2f64077b144c1f0 25-May-2016 Colin Cross <ccross@android.com> Remove USE_SOONG=false option

Soong is always required to build now.

Change-Id: I4e310e98e912b370ebf980bf609f04212a7e9a50
/build/make/core/main.mk
7fe992c0ccf61443f90976f6f18a61c242df7731 02-Mar-2016 Dan Willemsen <dwillemsen@google.com> Add NATIVE_TESTS class, move host native tests

Host native tests have been getting installed into
out/host/linux-x86/bin/..., but this pollutes the bin directory with a
lot of poorly named tests. Also, to support 32-bit and 64-bit tests, we
need to have different names with different suffixes. This causes
problems when tests expect to be named something specific (like gtest).
It's also convenient to store test data next to the test itself.

So with this change, native tests will be installed in
out/host/linux-x86/nativetest[64]/$(LOCAL_MODULE)/$(LOCAL_MODULE_STEM)
just like target tests get installed into /data/nativetest[64].

Implement this using a new NATIVE_TESTS class, which is like
EXECUTABLES, but sets up the install path differently, and configures
the rpath to load shared libraries with the proper relative path.
LOCAL_MODULE_RELATIVE_PATH can be used to control the directory name, it
will default to $(LOCAL_MODULE). This way multiple related tests can be
grouped together.

Target native tests also use NATIVE_TESTS now, but nothing should change
other than LOCAL_MODULE_RELATIVE_PATH can be used.

Change-Id: I535e42b1a6b21c5b8d6a580aa2f944d2be35e27d
/build/make/core/main.mk
958dc6098e2c04961cf20242962df2760b8162ca 17-May-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV" am: a794f4db22
am: 19fdc4428f

* commit '19fdc4428f9036b059a1174a3236eef03180e826':
Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV

Change-Id: I143bf88ad5031764644dfb2c8b279513c809b50b
db16dd23841cf9cdb62420eb3ab1eca71a9e102b 16-May-2016 Dan Willemsen <dwillemsen@google.com> Remove TARGET_LIBGCC/LIBATOMIC/LIBGCOV

Instead, use the libgcc/libatomic/libgcov from the static libraries dir,
which is provided by Soong. Copy the libraries using the Soong script if
Soong is disabled - this can be removed once USE_SOONG is removed.

Change-Id: Iad2ad20ad5c3cfc48bf1e46e594a482609098d7a
/build/make/core/main.mk
9d888e37bb2e3e58c52f642a9404ba14d39bcde6 14-May-2016 Colin Cross <ccross@android.com> Merge "Default USE_SOONG to true" am: ac33935ac1
am: c33da56ff3

* commit 'c33da56ff30e89f5b09ec02d0b50815b27ab833e':
Default USE_SOONG to true

Change-Id: Ib795a91a609da4402984c56a493e20dee90ec54f
ac33935ac1721c640ce39b722cb7471ea9a5949d 14-May-2016 Colin Cross <ccross@android.com> Merge "Default USE_SOONG to true"
2697421213c42e791affe2f2784774c2c4c09dc2 13-May-2016 Dan Willemsen <dwillemsen@google.com> Merge "Read Soong-exported configuration" am: c7b610a67e
am: bcbba61a25

* commit 'bcbba61a2500da9c51690ef8956e15020e9f6fea':
Read Soong-exported configuration

Change-Id: Ia23208e26bae53bd74bb77b0a0ebbe63ac6f8a9c
8b999ac63d7f7510a7c26556981c9c6f50c22126 29-Mar-2016 Dan Willemsen <dwillemsen@google.com> Read Soong-exported configuration

This is to ensure that Make and Soong agree on configuration variables
like TARGET_GLOBAL_CFLAGS. Only a few variables are actually checked
currently until we make more actually the same.

Bug: 23566674
Change-Id: Ibede43d933ede4d470e182f9490ea6ec4ef52fbc
/build/make/core/main.mk
42a5da7ca1d4701a265b123fe31574d6d8c537d3 05-May-2016 Colin Cross <ccross@android.com> Default USE_SOONG to true

Change-Id: Iad88aed4060b84aef2381f6300f16bad14f3a6ca
/build/make/core/main.mk
7a8e69eea22c34ad6d68b768bea56939c2ec42a9 21-Apr-2016 Chih-hung Hsieh <chh@google.com> Merge "Call clang-tidy based on WITH_TIDY* variables." am: 3f03b10654
am: c72f50d49f

* commit 'c72f50d49fb95794039f270d4083b9cfed4cd482':
Call clang-tidy based on WITH_TIDY* variables.

Change-Id: I4eb0afd79b56ad2ddea42b33791df27da6ab8820
a9a55c7c7e76b2741eb675c0880d242e350b79a3 01-Apr-2016 Chih-Hung Hsieh <chh@google.com> Call clang-tidy based on WITH_TIDY* variables.

* Call clang-tidy before every C/C++ compilation if
(1) clang-tidy is found at $(PATH_TO_CLANG_TIDY)
(2) $(my_clang) is true
(3) LOCAL_TIDY is 1 or true, or
LOCAL_TIDY is undefined and WITH_TIDY is 1 or true.
* clang-tidy is called with -checks=$(my_tidy_checks),
which has default '-*,google*,-google-readability*'
and can be overwritten by WITH_TIDY_CHECKS.
* LOCAL_TIDY_CHECKS is appended to $(my_tidy_checks)
* Extra flags are passed to clang-tidy through
WITH_TIDY_FLAGS or LOCAL_TIDY_FLAGS.
* To quickly find and fix clang-tidy warnings, set $(WITH_TIDY_ONLY)
to 1 or true to skip compilation of C/C++ files.
* Add a PHONY tidy_only target,
which includes all $(cpp_objects) and $(c_objects).
* The 'mm' and 'mmm' functions are changed to call make with
the 'tidy_only' target when WITH_TIDY_ONLY is true or 1.
In that case, only clang-tidy is called for C and C++ files.

Bug: http://b/27779618
Change-Id: I8adcfff217d68af49849b79aacee7d7654cafb1b
/build/make/core/main.mk
2e2c13791339e4a3b413ce985f86e42a1b91c012 13-Apr-2016 Ying Wang <wangying@google.com> Reject Google's build of JDK.

Bug: 28097637

(cherry picked from commit 22b23b9b00a3474c95cc314c33aa66a747be13e4)

Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
/build/make/core/main.mk
55fb35281e41e022e165ec2f65027742436060f4 14-Apr-2016 Ying Wang <wangying@android.com> Merge "Reject Google\'s build of JDK." am: 98f7a5c
am: cb9847c

* commit 'cb9847c8abb89bb37d9429aeb1862d04d378ccce':
Reject Google's build of JDK.

Change-Id: Ia33b50111b7dc8ea09552bc89ba6beb913ddd7ab
98f7a5c7446ceae437642934f3e49c870deb8066 14-Apr-2016 Ying Wang <wangying@android.com> Merge "Reject Google's build of JDK."
22b23b9b00a3474c95cc314c33aa66a747be13e4 13-Apr-2016 Ying Wang <wangying@google.com> Reject Google's build of JDK.

Bug: 28097637
Change-Id: I8afbd48230bdd1f198a873f72df1c178bed38d0e
/build/make/core/main.mk
39b6a8db6ab119e5be1e64be8f62dbbef43c5170 14-Apr-2016 David Zeuthen <zeuthen@google.com> Merge "Add support for Brillo partitioning." am: 2528968
am: 93a3423

* commit '93a34234c6a032251163992728def631c14a6e90':
Add support for Brillo partitioning.

Change-Id: I349463c75e8ddb312cf83bad845864e530c50405
25328627baceed4e09f01bd25ad016c2942669e3 08-Apr-2016 David Zeuthen <zeuthen@google.com> Add support for Brillo partitioning.

To generate partition tables in the Android build system, simply add
the path to a .bpt file to the BOARD_BPT_INPUT_FILES variable.

BOARD_BPT_INPUT_FILES += "hardware/bsp/vendor/soc/board/board-specific.bpt"

The variable BOARD_BPT_DISK_SIZE can be used to specify or override
the disk size, for example:

BOARD_BPT_DISK_SIZE := "10 GiB"

Additional arguments to 'bpttool make_table' can be specified in the
variable BOARD_BPT_MAKE_TABLE_ARGS.

If BOARD_BPT_INPUT_FILES is set, the build system generates two files

partition-table.img
partition-table.bpt

in ${ANDROID_PRODUCT_OUT} using 'bpttool make_table'. The former is
the binary partition tables generated using bptool's --output_gpt
option and the latter is a JSON file generated using the --output_json
option. These files will also be put in the IMAGES/ directory of
target-files.zip when running 'm dist'.

BUG=27831397
TEST=Manually tested.

Change-Id: Iedd15354afb2dd483dcb9bc001360b2a37fd6dc0
/build/make/core/main.mk
ae18638b0406ad107b0882a02a13cdd8b92f2a4e 22-Mar-2016 Dan Willemsen <dwillemsen@google.com> Handle symlinked OUT_DIRs (again)

My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

1) Soong generates out.angler/soong/Android.mk
2) Kati's find generator produces in-memory tree of the filesystem
3) $(shell ) creates out.angler/Android.mk
4) The emulated findleaves Android.mk search finds
out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit cc60f013576627bee37cd4d6c58bf740d35d0434)
[ccross: resolved conflicts in nyc-dev]
/build/make/core/main.mk
77f67cd0483acdd549aaa66c7dd4e530b097ad4e 25-Mar-2016 Ying Wang <wangying@google.com> Merge "Support x86+arm multilib build."
am: d314805

* commit 'd314805c29fdbee3508b99c14ca63e1a8d170c3b':
Support x86+arm multilib build.
87538e4f8b2e0451c03dbbe86d9e868b6d1a930b 17-Mar-2016 Ying Wang <wangying@google.com> Support x86+arm multilib build.

Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.

In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.

Bug: 27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit 277e75a488b1b6599482aed9f7c046747baa10df)
/build/make/core/main.mk
6e6a16752198550ae1c15d01e31addb2a8c89538 25-Mar-2016 Colin Cross <ccross@android.com> Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev
am: c031c75

* commit 'c031c758c63c83679cf55abb50ba9e4474d22814':
Ignore Android.mk files with USE_SOONG=true
fbc5b9f56b89dfeacbb05f9e780e5c0a34feabdb 11-Mar-2016 Ying Wang <wangying@google.com> Rebuild odex files in PDK fusion build.

To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
(cherry-pick from commit 3a61eeb6cb588b9a206bd80814183bcc0263cd13)
/build/make/core/main.mk
946a08cf51af7bb4f4ca833cca3510e78ccb93a3 11-Jan-2016 Colin Cross <ccross@android.com> Ignore Android.mk files with USE_SOONG=true

When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.

Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
(cherry picked from commit 861ab99536bf1a7a3b15dd08c17b9047fc88014b)
/build/make/core/main.mk
b101826b15e53f5af2132c5dd5bd9e59a294edc9 24-Mar-2016 Dan Willemsen <dwillemsen@google.com> Merge "Handle symlinked OUT_DIRs (again)"
am: fe09018

* commit 'fe09018b39920715607a19a0807863c95e0b8372':
Handle symlinked OUT_DIRs (again)
fe09018b39920715607a19a0807863c95e0b8372 24-Mar-2016 Dan Willemsen <dwillemsen@google.com> Merge "Handle symlinked OUT_DIRs (again)"
f3920d0aacd60ceeb3fa62331869272ecfa6bd1b 24-Mar-2016 Ying Wang <wangying@google.com> Merge "Add phony target javac-check."
am: 49b524c

* commit '49b524cb4a6d74b3fee49a728714d74202ce76f0':
Add phony target javac-check.
cddeb6c4f0e5e864bc11cf7e5d61822b9dda1b69 24-Mar-2016 Ying Wang <wangying@google.com> Add phony target javac-check.

javac-check covers all classes.jars that are compiled with javac
instead of jack. This target is required by tools that still need java
class files as input.

Bug: 26705771
Change-Id: I6896b9a6026a2a0dae6145d1ef5a839756aa3458
/build/make/core/main.mk
1e061d789ad9761086c3923f5ff6e6bdb8cf5738 24-Mar-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove ALL_PREBUILT, all users have been removed"
am: cfb5545

* commit 'cfb554566447b31cd045a5b67b960018418fe874':
Remove ALL_PREBUILT, all users have been removed
3006962257a1ef421dc62bbfa94119e9d7a75dc8 23-Mar-2016 Dan Willemsen <dwillemsen@google.com> Remove ALL_PREBUILT, all users have been removed

Change-Id: I37154506ef419e7a68ce7e2d864624d2ae53206f
/build/make/core/main.mk
cc60f013576627bee37cd4d6c58bf740d35d0434 22-Mar-2016 Dan Willemsen <dwillemsen@google.com> Handle symlinked OUT_DIRs (again)

My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

1) Soong generates out.angler/soong/Android.mk
2) Kati's find generator produces in-memory tree of the filesystem
3) $(shell ) creates out.angler/Android.mk
4) The emulated findleaves Android.mk search finds
out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
/build/make/core/main.mk
c9a19779a219bd9e4dd162d30249be7d22020c67 15-Mar-2016 Ying Wang <wangying@google.com> resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp

Now we can remove all uses of $(ACP) in prebuilt_internal.mk.

Change-Id: I07a449f3acca9b56c6a387ff8ca1535d19c872d1
3a61eeb6cb588b9a206bd80814183bcc0263cd13 11-Mar-2016 Ying Wang <wangying@google.com> Rebuild odex files in PDK fusion build.

To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
/build/make/core/main.mk
ed5a610654e862765e605c042813f6c7c367e4ac 01-Mar-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add options for dynamic linker developer warnings" into nyc-dev
am: 837d60f49a

* commit '837d60f49a5c764bd427c7d8b75d291c83344984':
Add options for dynamic linker developer warnings
9ffa38b193e939d8c2a3ab9818eebf66a0b62ef3 29-Feb-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove USE_NINJA=false" am: 3bfc095f53
am: d73633c082

* commit 'd73633c0824a63f7104bddf9a798bccc952b545c':
Remove USE_NINJA=false
f22789edd095c5a79e341cc1973cf9cde8bc9698 27-Feb-2016 Dimitry Ivanov <dimitry@google.com> Add options for dynamic linker developer warnings

Add bionic options that enable developer warnings for
beta/preview builds.

Bug: http://b/27365747
Change-Id: Ifc2ab706975558824522da5eece186e1660969ad
/build/make/core/main.mk
1c6dc5b94276ac8cfdc5a6579ee8964f0dc2f315 06-Jan-2016 Dan Willemsen <dwillemsen@google.com> Remove USE_NINJA=false

And everything special-cased on that. Add a warning if USE_NINJA is
set to let users know that it no longer changes anything.

Change-Id: Ib8739151fe26ea6bf8f76b7ac2b8f4097dab0b47
/build/make/core/main.mk
e575822d530b680be5d69626a283305286b2f3dd 26-Feb-2016 Keun Soo Yim <yim@google.com> Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev
am: 4773d29ab7

* commit '4773d29ab74b15895550d04bf5ac72899d036385':
build file change for vts to use the existing cts-tradefed infrastructure
172b7d421ef9a7dda6b7bedb3ceb0c87799bb528 25-Feb-2016 Keun Soo Yim <yim@google.com> build file change for vts to use the existing cts-tradefed infrastructure

Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
/build/make/core/main.mk
3714f7876c84cb17a5822cbb1ecb7f852b641b27 09-Feb-2016 Dan Willemsen <dwillemsen@google.com> Merge "Disable java when JAVA_NOT_REQUIRED is set"
am: 74606c40cd

* commit '74606c40cdf0552c58b07b1477e79690e6037930':
Disable java when JAVA_NOT_REQUIRED is set
fdf89cd57521bfe45df6ad7d2caefcb1fa5b7438 06-Feb-2016 Dan Willemsen <dwillemsen@google.com> Disable java when JAVA_NOT_REQUIRED is set

Change-Id: Id3056cde93302be20000bf7af33aeed0fa8fdf52
/build/make/core/main.mk
8192d3b821d5969384e88891f6493392af110643 02-Feb-2016 Sebastien Hertz <shertz@google.com> Merge "Support code coverage with Jack" am: 4dad88980f
am: 7b02e64148

* commit '7b02e64148e6a1c0355d715b2a8034061f0d2837':
Support code coverage with Jack
4dad88980f49f40fb13ab57659c1016e12ca0cb9 02-Feb-2016 Sebastien Hertz <shertz@google.com> Merge "Support code coverage with Jack"
d6620a3e1009db5dd39964db98bf4aee75ddfe52 30-Jan-2016 Lee Campbell <leecam@google.com> Merge "brillo: Remove dependency on java for Brillo" am: 6c8e3e4108
am: fd5d6f440a

* commit 'fd5d6f440a13643f4e645e960e1f2c417af3355a':
brillo: Remove dependency on java for Brillo
3d8bf2994c4e8e17500f79acf9b9decb8adc40af 29-Jan-2016 Lee Campbell <leecam@google.com> brillo: Remove dependency on java for Brillo

Brillo does not require Java. Add a JAVA_NOT_REQUIRED
flag to the build system to make the jdk requirment optional

Also don't build signapk for Brillo

BUG: 25281898
Change-Id: I31e68cc7d076bf6c234699c77c0ea1ea428be4f5
/build/make/core/main.mk
dfce8ad4f4b0817f0484334f3000bb3cbbed86fc 19-Nov-2015 Sebastien Hertz <shertz@google.com> Support code coverage with Jack

Building an app with Jack and with the environment variable
EMMA_INSTRUMENT_STATIC set to true will apply code coverage
onto the app targeting Jacoco.

Bug: 20115492
Change-Id: Ief3640fa3faa466f7f6aaa9739e06d3db24110a0
/build/make/core/main.mk
fcf7c81a7fdd0a427965f147742f4eabe45aab1c 25-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Revert "Make OpenJDK 8 the default""

Reapply the JDK 8 switch in internal builds.

This reverts commit 85bddfdedffb425d85657314591a57191113806b.
/build/make/core/main.mk
3ec8eeb90b0facefc0ca60cdd1fce0626ce5eefd 25-Jan-2016 Neil Fuller <nfuller@google.com> Merge "Revert "Make OpenJDK 8 the default"" am: c0acea2571
am: a5e4ea2e44

* commit 'a5e4ea2e44e324101b412bac9f2fbb97bdc91670':
Revert "Make OpenJDK 8 the default"
1f495b865e7632771e937f7cc5c1f926fc5ac7dd 25-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Revert "Make OpenJDK 8 the default""

Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfdedffb425d85657314591a57191113806b.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
/build/make/core/main.mk
85bddfdedffb425d85657314591a57191113806b 25-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Make OpenJDK 8 the default"

Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.

This reverts commit 4495f6afb8c23950c24dc9ee114050582da08f05.

Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5
/build/make/core/main.mk
4495f6afb8c23950c24dc9ee114050582da08f05 16-Dec-2015 Neil Fuller <nfuller@google.com> Make OpenJDK 8 the default

To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
/build/make/core/main.mk
1b5f487f10809cc02aa1a944cddb83adeae5dc6f 20-Jan-2016 Narayan Kamath <narayan@google.com> Make a confusing error message clearer.

The java version doesn't matter here.

Change-Id: Ieb933f87d1255e7aea5d21b3ac96e4f1f755deea
/build/make/core/main.mk
3dfaceea79e420452bcea3acc325700d20596bc5 15-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Revert "Revert "Revert "Make OpenJDK 8 the default""""

This reverts commit ee89f219ea8298c3b4718ae0dd05061ce372b384.

This reapplies commit
1bd16b67c4b05f9df1f6d9ef85365929df0c34ef
for the third time.

Change-Id: I3be72f643f5ddce87dfc39d98f19e395525554d8
/build/make/core/main.mk
ee89f219ea8298c3b4718ae0dd05061ce372b384 14-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Revert "Revert "Make OpenJDK 8 the default"""

This reverts commit c288d657623ed646343d867a413a26b0592c1853.

The launch control change that switched various builds
to JDK 8 was reverted so JDK 8 can't be mandatory without
breaking builds.

Change-Id: I5e3feb21488d3bb57c5718cfe105a931eeaa9587
/build/make/core/main.mk
c288d657623ed646343d867a413a26b0592c1853 12-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Revert "Make OpenJDK 8 the default""

This reverts commit a87553f41453e3558fc9afb6a66a75f6e5ea29f0.

Change-Id: Ibd7bf08f3adfdc3f50584b8a61b3f81f1bff53de
/build/make/core/main.mk
861ab99536bf1a7a3b15dd08c17b9047fc88014b 11-Jan-2016 Colin Cross <ccross@android.com> Ignore Android.mk files with USE_SOONG=true

When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.

Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
/build/make/core/main.mk
a87553f41453e3558fc9afb6a66a75f6e5ea29f0 11-Jan-2016 Neil Fuller <nfuller@google.com> Revert "Make OpenJDK 8 the default"

Reverting until all continuous builds that cover branches downstream of master can be updated to use JDK 8.

This reverts commit 1bd16b67c4b05f9df1f6d9ef85365929df0c34ef.

Change-Id: Icb0daa440a6286e07d3cfd9ff8b082b4154ebc21
/build/make/core/main.mk
1bd16b67c4b05f9df1f6d9ef85365929df0c34ef 19-Nov-2015 Neil Fuller <nfuller@google.com> Make OpenJDK 8 the default

To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: Iba08a9d3cf73bae7124e431dfe87c20ac219591e
/build/make/core/main.mk
f09b468fccc251b4907c69d9d68bdec07535a33f 23-Dec-2015 Nick Kralevich <nnk@google.com> Merge "set ro.adb.secure=1 for user builds" am: f9911ae087
am: 45407b471e

* commit '45407b471ef831fc10e79fc1f9ea5a6c8d838387':
set ro.adb.secure=1 for user builds
f9911ae087189c26e0ef8a2334233116a8944aa7 23-Dec-2015 Nick Kralevich <nnk@google.com> Merge "set ro.adb.secure=1 for user builds"
18a141cc8c06a30266adeb4c33c99b8c0b348a8e 16-Dec-2015 Daniel Micay <danielmicay@gmail.com> set ro.adb.secure=1 for user builds

In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).

Bug: 22220212
Bug: 21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919
/build/make/core/main.mk
4ef01c412a68274ab93c2a0292de5ac5894ee00c 22-Dec-2015 Yohann Roussel <yroussel@google.com> resolve merge conflicts of 42c42b6971 to master.

Change-Id: I40e2d2f7cd3e047bc3bc661f20c7415ce751b321
4a017112672901130c7ceb6c778f1ca243f2dd49 22-Dec-2015 Yohann Roussel <yroussel@google.com> Merge "Always start jack server before first call to jack"
cb16289b0647b520a6db414589056d172359dfa0 16-Dec-2015 Colin Cross <ccross@android.com> Merge "Combine soong builds into make builds" am: 3bfc560cc5
am: 17d3f5426b

* commit '17d3f5426b71a510244bdbbe5a0e7f0548692420':
Combine soong builds into make builds
3ebb2f732693121e030e04a2faddb8a6ecac5dac 09-Nov-2015 Colin Cross <ccross@android.com> Combine soong builds into make builds

Bootstrap soong if necessary, and wrap the kati and soong ninja files
into a single ninja file.

Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
/build/make/core/main.mk
2ad526124c60dccc24ee5b157787f1f01b323963 15-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Revert "Revert "Make PIC and PREOPT default for all.""

bug:25801231

This reverts commit f2a9135ed14a59da38a65a0218e8e8486620a3ad.

Change-Id: I2eca605212b78505667af1f7e9c83f5cca5db35a
/build/make/core/main.mk
f2a9135ed14a59da38a65a0218e8e8486620a3ad 14-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Revert "Make PIC and PREOPT default for all."

Need to update seed and ariel.

This reverts commit b93f5905d268b8745dac1689f0871fa5c5b28315.

Change-Id: Icc6f1539a97ccb2b1fcb12d2bc48904045689096
/build/make/core/main.mk
b93f5905d268b8745dac1689f0871fa5c5b28315 11-Dec-2015 Nicolas Geoffray <ngeoffray@google.com> Make PIC and PREOPT default for all.

bug:25888050
bug:25801231

Change-Id: Idf0f466a00dd592c433fc798c29ed80396015713
/build/make/core/main.mk
9214a26cfc377736ebeb26ce47b84c671281a099 03-Dec-2015 Yohann Roussel <yroussel@google.com> Always start jack server before first call to jack

Also install and update the server if necessary.

The target start-jack-server produces no file so it's always built.
Since the dependency is "order only", it doesn't cause force rebuilt of
jack targets after start-jack-server execution.

Bug: 25443108

Change-Id: I1608d87d186694d47307e00337b1905f0b8079c4
/build/make/core/main.mk
7601f91de056b98cf9c3c950b927b9f708975cea 24-Nov-2015 Shinichiro Hamaji <hamaji@google.com> Merge "Prevent findleaves.py from traversing copies of " am: 84639d127b am: 22a2efde22
am: 336c2527e3

* commit '336c2527e31d1691ac9c9538c7e19f80c6493969':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
6a378a3a7a6862e7402a6341f6cfb0ecf7a6824d 19-Nov-2015 Shinichiro Hamaji <hamaji@google.com> Prevent findleaves.py from traversing copies of $(OUT_DIR)

by putting blank Android.mk and CleanSpec.mk in $(OUT_DIR).

Bug: 25732342
Change-Id: I3fcc4efddb9ee5ce309502e978f0589335af8371
/build/make/core/main.mk
d806b521b88ebd0e5ff5a843a30cbf8ba3b4e0b5 13-Nov-2015 Dan Albert <danalbert@google.com> Merge "Make not having Jack non-fatal." am: 5f88dd0dd6 am: 37a9e5d568
am: 934f9fec3d

* commit '934f9fec3d72757f4a17c0abab0daea0ef9d4cdf':
Make not having Jack non-fatal.
fd8c722714a2928bf4e86a9d9fb1d4753b1c9490 13-Nov-2015 Dan Albert <danalbert@google.com> Make not having Jack non-fatal.

Not every build needs Java.

Bug: http://b/17441393
Change-Id: Ia55742cfd43c3a4f9c7873b87816bcce99f8156f
/build/make/core/main.mk
751c26af31e4a862565b2820ebea503092aa7a73 11-Nov-2015 Ying Wang <wangying@android.com> Merge "Add suffix .so to use directly libart.so" am: d1fd823f33 am: d54b9e6ba0
am: d06577781c

* commit 'd06577781c169c5292c79c71485764ad3f19547d':
Add suffix .so to use directly libart.so
59bdffa76ab106d4fdca29b93ea1d852780e31e0 10-Nov-2015 randy.jeong <randy.jeong@samsung.com> Add suffix .so to use directly libart.so

It should be the complete name with suffix .so to use libart.
At present, unnecessarily falls back like below.
"Falling back from libart to libart.so after dlopen error:
dlopen failed: library "libart" not found"

Change-Id: Ie5da35a71d6661434d2097c842407e6a254f8f58
Signed-off-by: randy.jeong <randy.jeong@samsung.com>
/build/make/core/main.mk
56a84e1b6cb3368e3f97c1de03bb3b3980e29b18 05-Nov-2015 Nicolas Geoffray <ngeoffray@google.com> Make jit the default for all builds.

Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
/build/make/core/main.mk
4a4a0bc38f01f67445354543cfae4dafb3e84028 28-Oct-2015 Ying Wang <wangying@google.com> Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.

ANDROID_GOALS: any Android goals that need to be built.
KATI_GOALS: goals that we need to pass to Kati.
NINJA_GOALS: goals we need to pass to Ninja.

For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS),
we don't need to pass them to Ninja. See also commit
80e46c7c5cb7b1d80114876d301798a8624b4200.
Restore the dist rule removed by the above commit.

Previously "droid" was never passed to Ninja. That's incorrect.
"make droid docs" should build both docs and droiod.
Fixed with this change.

Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
/build/make/core/main.mk
67132baa4d11917030c5156f507a50110c4cd935 29-Oct-2015 Ying Wang <wangying@google.com> Fix "make product-graph" and "make dump-products".

- For unmodified "make product-graph" and "make dump-products",
load only the current product configuration makefiles. This is much
faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
"make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
the Android.mks, which takes long and we don't really need them.
More importantly, with all product makefiles loaded, modules in
Android.mks are prone to clash (if they are conditionally included
by variables set up in product makefiles) and lead to parse-time
error.

Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
/build/make/core/main.mk
ec1b561981ee6dada4399b80d413b6c84a3177bd 24-Oct-2015 Colin Cross <ccross@android.com> Add dummy description for GET-INSTALL-PATH

kati takes the first @echo command in a rule and turns it in to a ninja
description that gets pretty-printed. The GET-INSTALL-PATH is only
@echo commands and is parsed by development/testrunner/runtest.py, so
it fails to parse the pretty-printed first test.

Add a dummy @echo to GET-INSTALL-PATH for kati to use as the
description, so the rest of the @echo commands are left unmodified.

Change-Id: I192fde48b26726a2f6760448f819243bd2f21312
/build/make/core/main.mk
8998d57404b73bf4df059542df4dc52631db45c9 03-Jul-2015 Yohann Roussel <yroussel@google.com> Allow control of jack used for compilation

Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

(cherry picked from commit b68c9a498d1e2c631eb6e8c9092d4d5775402083)

Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
/build/make/core/main.mk
e8304ef7686cf1956ac81bc8aaee2c4b214fa861 12-Oct-2015 Neil Fuller <nfuller@google.com> Fix for Java 8 toolchain builds

We don't need to assume the OpenJDK (i.e. for Mac builds).

Change-Id: I1ac1856813045c7b1478dee6b08ad7b49300e4d7
/build/make/core/main.mk
e06e961cc69b48e562f42464d4db0adc2b8d81d9 29-Sep-2015 Colin Cross <ccross@android.com> am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"

* commit '7edec14c8dfe4e499cba0d77dc20bc985af1f586':
Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
fe5e6894d2b16b76347fdd115a4538cd35d559ec 29-Sep-2015 Colin Cross <ccross@android.com> Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build

Distinguish between parsing makefiles in make for a pre-ninja build,
parsing makefiles in kati for a ninja build, and parsing makefiles in
make for a non-ninja build by leaving USE_NINJA=true enabled for the
kati pass but also setting BUILDING_WITH_NINJA.

Change-Id: I63f1ce1efe08cd86fdf41f8051901f720b38cfaf
/build/make/core/main.mk
ad4b1ef65eb0d2dd783a439732631a5d86efc7f3 26-Sep-2015 Colin Cross <ccross@android.com> am 581a028f: Merge "Remove checkbuild and test from parse time goals"

* commit '581a028fb562b1d877de2b82d6a08df045d73ec8':
Remove checkbuild and test from parse time goals
c53d6b90b30ad148313010779463e3494fbd014d 26-Sep-2015 Colin Cross <ccross@android.com> Remove checkbuild and test from parse time goals

The tests goal is not a parse time goal.

The checkbuild goal is only a parse time goal so that it doesn't result
in a circular dependency between droid and checkbuild when
ANDROID_BUILD_EVERYTHING_BY_DEFAULT is set. Get rid of the circular
dependency by making droid depend on droid_targets, and droid_targets
depend on the targets that are normally built for droid. checkbuild can
then always depend on droid_targets, and droid can condtionally depend
on checkbuild without introducing a circular dependency.

Bug: 24413153
Change-Id: I231d80e05ffe321384a5efbcdf5578f86ad84da0
/build/make/core/main.mk
425d0248a1949208de7b715155ad0d6036c46bc1 22-Sep-2015 Colin Cross <ccross@android.com> am 9ff24387: Merge "Make USE_NINJA=true the default"

* commit '9ff24387c205da60e3d7deb042530b1d0b2d881c':
Make USE_NINJA=true the default
f77030bb300dc69c63d5e795f48e4b67cddcf8d9 19-Sep-2015 Colin Cross <ccross@android.com> Make USE_NINJA=true the default

Build with kati + ninja by default, unless specifically disabled with
USE_NINJA=false in the environment or on the make command line.

Bug: 23565895
Change-Id: I1fa9f5c6eb4d4ed3f5b81454f89d19fd2f1f6abb
/build/make/core/main.mk
bc195b36d7fa0cbd35d12449d37f8aefb60ea946 17-Sep-2015 Ying Wang <wangying@android.com> am 6fb36397: Merge "Use /ninja_build to mark ninja build."

* commit '6fb36397e56336e08a75e7101d6d47a98a27aea1':
Use $(OUT_DIR)/ninja_build to mark ninja build.
eb1e18e68904287058644867cb4304a9e7c58a2d 17-Sep-2015 Ying Wang <wangying@google.com> Use $(OUT_DIR)/ninja_build to mark ninja build.

Bug: 23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
/build/make/core/main.mk
942672d82b7be88c252ff4c979039eb40349cef0 16-Sep-2015 Ying Wang <wangying@android.com> am 45075cf6: Merge "Generate installed-files-vendor.txt"

* commit '45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
8da19e36886a404d535c52d6d54ab2adb35f099c 15-Sep-2015 Ying Wang <wangying@google.com> Generate installed-files-vendor.txt

Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.

Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
/build/make/core/main.mk
c98d9a9d0ff4ae5a99d45d79c43699c302e4e1a3 09-Sep-2015 Dan Willemsen <dwillemsen@google.com> am f1c09d7f: Merge "Add HOST_CROSS_OS"

* commit 'f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
Add HOST_CROSS_OS
057aaea54a8dd6aa769290b1c0f471a17aaf1a22 14-Aug-2015 Dan Willemsen <dwillemsen@google.com> Add HOST_CROSS_OS

Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.

Bug: 23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
/build/make/core/main.mk
3351178fb88369b627e36e008e8722d721eaf18b 08-May-2015 Ying Wang <wangying@google.com> Cleaned the outdated incrementaljavac.

Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit 90598cb70c3a6e65223f02c4104e823024caf693)
/build/make/core/main.mk
c9343c0bc316536772700926d555be42783fac62 25-Aug-2015 Ying Wang <wangying@android.com> am cf129c53: am a7eaf450: Merge "Dist the otatools package."

* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
Dist the otatools package.
267e957373765ad1e3ce89abe61886a305277027 25-Aug-2015 Ying Wang <wangying@google.com> Dist the otatools package.

Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
/build/make/core/main.mk
1b14846717876e8e6372ffc82f0874925fcacbf7 18-Aug-2015 Dan Willemsen <dwillemsen@google.com> am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"

* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
05d97fe723ea376edb5fe6b12535485311a32418 18-Aug-2015 Dan Willemsen <dwillemsen@google.com> Merge "Remove legacy windows platform build support"
9cf990beec6ef42c09c39e49d3e5991e96a9608b 18-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp

Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
145ae32069d830d9318b61a996633126141c25a7 13-Aug-2015 Dan Willemsen <dwillemsen@google.com> Remove legacy windows platform build support

We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.

Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
/build/make/core/main.mk
ccc933e97b5bb2c4f98923d77845cf102c4ee3ab 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Use repeatable timestamps

This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
/build/make/core/main.mk
8478f7abbd93982cb2bb3536a5e5af19b3c6755b 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of b184ec2a to mnc-dev-plus-aosp

Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
33f46daa22597ac5c50601d28036c563b6e23fa5 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of c576c08f to mnc-dev-plus-aosp

Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
92026f2d366bc33ee974b0e74af071a894642d0c 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Revert "Use repeatable timestamps"

OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
/build/make/core/main.mk
13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Use repeatable timestamps

This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
/build/make/core/main.mk
72a8e48b56483c731950de1e29adf4a23b3d5f6a 30-Jul-2015 Ying Wang <wangying@android.com> am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."

* commit 'ac6e6b347b49b4c15df1f1b2869f2c386f2755d6':
Use unmodified MAKECMDGOALS in ninja.mk.
bb1da5e614a26fb9d973c88db2c56a1f294f332d 29-Jul-2015 Ying Wang <wangying@google.com> Use unmodified MAKECMDGOALS in ninja.mk.

The build system removes targets like "PRODUCT-full-eng" from
MAKECMDGOALS in build/core/product_config.mk.
Without this change, such target isn't passed to kati.

Change-Id: I0b3949ed1f5557445d7f5d5bd59b7875c0b2ea7f
/build/make/core/main.mk
c0debc427a85d4c78c1ffcb4dfacb0729f8f5690 24-Jul-2015 Ying Wang <wangying@android.com> am 3d2c90d1: am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""

* commit '3d2c90d18608650614cf3940179cf13251e82178':
Fix mmma uses like "mmma ./external/apache-harmony"
c097d1f06e9701d326d693cbfa32ee7f9435f1fb 24-Jul-2015 Colin Cross <ccross@android.com> am 4f4c7c22: am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"

* commit '4f4c7c22284729d5c1a256590edd387e9d9798dd':
Build with kati+ninja when USE_NINJA=true
cb0314145956c4f918c961e2ecbdfb97a080ac61 24-Jul-2015 Ying Wang <wangying@android.com> Merge "Fix mmma uses like "mmma ./external/apache-harmony""
a5184806be4f6b03eae1c131c032d3d97b6d9de6 24-Jul-2015 Ying Wang <wangying@google.com> Fix mmma uses like "mmma ./external/apache-harmony"

Fix mmma uses like "mmma ./external/apache-harmony" by removing the
leading ./ in entries in BUILD_MODULES_IN_PATHS.

Change-Id: I414e734c8a29434fc89ddb2b745613c33709c5e3
/build/make/core/main.mk
3b324cb32e6872d0e6a21898cfe63b9d78cc04db 17-Jul-2015 Colin Cross <ccross@android.com> Build with kati+ninja when USE_NINJA=true

If USE_NINJA=true, use kati to translate makefiles into ninja files,
and then execute them with ninja.

Builds kati from source using simplified versions of the rules
in binary.mk and definitions.mk.

Adds two new goals when USE_NINJA=true: generateonly will regenerate
build.ninja but not rebuild (useful for comparing build.ninja output
between runs), and fastincremental will skip regenerating build.ninja
and go directly to running ninja, providing ~5 second incremental
builds.

Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
/build/make/core/main.mk
6c4176e2d04113f2bfbc2c677e7f37ab799718d9 23-Jul-2015 Ying Wang <wangying@android.com> am 8b4d1432: am cd7dfdb4: Merge "Cleanups."

* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
Cleanups.
f5e94cc17f6607419a94263873fd395a881af01a 23-Jul-2015 Ying Wang <wangying@android.com> am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."

* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
Create OUT_DIR before writing build_number.txt.
8d9dfa3d9b3874ef03df93e3bac9620a7ccb0d43 23-Jul-2015 Colin Cross <ccross@android.com> resolved conflicts for merge of 8c25fd56 to mnc-dev-plus-aosp

Change-Id: I318ce3d7bbfbcaf849a36543662f4c63b7377927
cd7dfdb4bf3f7d431d2a37908c550a83a282bf22 22-Jul-2015 Ying Wang <wangying@android.com> Merge "Cleanups."
06332732a48d1b229cc5886cc45f27bb2ccbe8d7 22-Jul-2015 Ying Wang <wangying@google.com> Create OUT_DIR before writing build_number.txt.

Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
/build/make/core/main.mk
bbd47556477369da070be7879b45bc912a427f3a 22-Jul-2015 Ying Wang <wangying@google.com> Cleanups.

- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
supports JNI embedded in apk.

Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
/build/make/core/main.mk
f37b455858af45b36f14213696d2b55802a774c1 17-Jul-2015 Colin Cross <ccross@android.com> Read BUILD_NUMBER from file in rules

Using $(BUILD_NUMBER) inside a rule causes odd behavior, as the rule
is different every time make is run, but since make doesn't depend
on the command line it only ends up being built with the new value
if some other dependency has changed.

To allow ninja, which does depend on the command line, to provide the
same behavior, store the build number in out/build_number.txt, and
use a shell expansion to cat the file in rules that use it. This will
cause the rule command to stay identical between builds, while still
getting the new build number if the rule is rerun for a dependency.

Also use the same trick for BUILD_FINGERPRINT, and the date in
droiddoc rules.

Change-Id: I6c5e6b6b3ef4c613563d7f5604df0e401575ba5f
/build/make/core/main.mk
e45589760866ec64f4c7a8ab186caa981554313e 23-Jun-2015 Ying Wang <wangying@android.com> am 3f249ac5: am 82f6383f: Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules"

* commit '3f249ac58f8d7854850a5c936634389a1ed6e9b0':
Add variable ANDROID_NO_TEST_CHECK to not build all test modules
cd5bee3546278fe6027bb473e404c93175d8b1b3 11-Jun-2015 Claes Elgemark <claes.elgemark@sonymobile.com> Add variable ANDROID_NO_TEST_CHECK to not build all test modules

Introduce a way to speed up local builds. Don't build all test
modules if ANDROID_NO_TEST_CHECK is set to true.

On master branch this reduces what is built by more than
300 apps and 50 java libraries. Time for doing this on a
12 core machine running with -j13 is about 10 minutes.

Change-Id: I90feb108695ee60d0dbbf497644f767cc3748215
/build/make/core/main.mk
3c114682527bb496b73329b01625f7fdba089acf 12-Jun-2015 C. Sean Young <csyoung@google.com> am 6f44670a: am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.

* commit '6f44670ada093f4a11a343dddf0f8d0a0a8280d6':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
6f44670ada093f4a11a343dddf0f8d0a0a8280d6 12-Jun-2015 C. Sean Young <csyoung@google.com> am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.

* commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
cbaead4cfe737c96c649672b6c1396c35597b5b7 12-Jun-2015 C. Sean Young <csyoung@google.com> am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.

* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
cf4699895ad99b83a24e376007750e2c2c0502f6 09-Jun-2015 C. Sean Young <csyoung@google.com> Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.

These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.

Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
/build/make/core/main.mk
ef3c0325becc5e5d8f2758a098e2cc709b78f36e 19-May-2015 Siva Velusamy <vsiva@google.com> am 70b67acc: Don\'t exclude GPL binaries from the emulator system image

* commit '70b67accbfb80c9d238c7b2121f3ba6d1691e2b0':
Don't exclude GPL binaries from the emulator system image
70b67accbfb80c9d238c7b2121f3ba6d1691e2b0 18-May-2015 Siva Velusamy <vsiva@google.com> Don't exclude GPL binaries from the emulator system image

GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
/build/make/core/main.mk
f59733e97a7e291c831ae4c02fbcbfcd8d74fc30 18-May-2015 Vince Harron <vharron@google.com> am 1dadfec6: Merge "Improved/clarified license guidance for GPL code." into mnc-dev

* commit '1dadfec6e02cc362ed36e7e39b7cc49b6a00731d':
Improved/clarified license guidance for GPL code.
a48c74fb3d742eff87671668a9e6019cc17c3461 16-May-2015 Vince Harron <vharron@google.com> Improved/clarified license guidance for GPL code.

This messaging approved by Google Open Source Licensing.

Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
/build/make/core/main.mk
12b3ec7f3a3480ecd016831063217f94cd16d12c 08-May-2015 Ying Wang <wangying@google.com> am 90598cb7: Cleaned the outdated incrementaljavac.

* commit '90598cb70c3a6e65223f02c4104e823024caf693':
Cleaned the outdated incrementaljavac.
90598cb70c3a6e65223f02c4104e823024caf693 08-May-2015 Ying Wang <wangying@google.com> Cleaned the outdated incrementaljavac.

Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
/build/make/core/main.mk
10743961204a10b7c320e53f6ec937b3113769d8 08-May-2015 Ying Wang <wangying@google.com> am d5087784: Merge "Revert "Fix and cleanup."" into mnc-dev

* commit 'd508778493323e5a992110e6990ad120cb9a65c0':
Revert "Fix and cleanup."
884738e4a67d1eccb1d8225239a3e836a84f444c 08-May-2015 Ying Wang <wangying@google.com> Revert "Fix and cleanup."

This reverts commit f28bad5227dd566395e458b5266e716d7fa5f958.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
/build/make/core/main.mk
d9ac1334191aa9d74094f16551697662cb48dfeb 08-May-2015 Ying Wang <wangying@google.com> am 22571e18: Merge "Fix and cleanup." into mnc-dev

* commit '22571e18570c01310372261ce5f3dbc7bd3f5616':
Fix and cleanup.
f28bad5227dd566395e458b5266e716d7fa5f958 08-May-2015 Ying Wang <wangying@google.com> Fix and cleanup.

- Detect java-source-list before transforming to java-source-list-uniq.
This fixes non-fatal errors in build log like:
/bin/bash:
out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list:
No such file or directory
- Cleaned the outdated incrementaljavac. Nobody is using this feature
and now we switched to jack.

Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
/build/make/core/main.mk
777193721532e4342dd11190ad9220074d86bd02 07-May-2015 Dan Albert <danalbert@google.com> am 6ce55427: am 48240423: Merge "Fix JDK check for USE_MINGW=1."

* commit '6ce55427db7a9791042b90953dc2400ecee9bd7b':
Fix JDK check for USE_MINGW=1.
e76bb83fcdec382ee2eda0326f1f3ce416d05a54 05-May-2015 Dan Albert <danalbert@google.com> Fix JDK check for USE_MINGW=1.

Change-Id: I3bdd9258e8870fc00a5f1f74682a949dc487d851
/build/make/core/main.mk
4091bdb16864638e83ba7a501c2745db92d569d3 25-Apr-2015 Elliott Hughes <enh@google.com> am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comment typo."

* commit '6e40faa241b241f1c32edb40d36f9c407d8f6790':
Fix a trivial comment typo.
ae1d4b0d1834f0fcfe03d33691fe6815fb73af39 25-Apr-2015 Elliott Hughes <enh@google.com> Fix a trivial comment typo.

Bug: https://code.google.com/p/android/issues/detail?id=170069
Change-Id: Iacd308893561a991971b191d4d10a78ca82753d4
/build/make/core/main.mk
0626a6421e85198a012c16db7a48a4327c445522 23-Mar-2015 Mathieu Chartier <mathieuc@google.com> am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"

* commit '783a632f45fdddaa2073445728db61d2041a3435':
Change eng builds from interpret-only to verify-at-runtime
62a7cac50dd8334ac051f8a50241f2fc224f9bce 19-Mar-2015 Mathieu Chartier <mathieuc@google.com> Change eng builds from interpret-only to verify-at-runtime

Faster dex2oat -> faster boot after syncing core libraries.

Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
/build/make/core/main.mk
eda38d7718173089260a7a6fd0d80e780412f8b7 19-Mar-2015 Mathieu Chartier <mathieuc@google.com> am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""

* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
8b11285dd990bd25e9c6c98be4a764008b09b2a8 19-Mar-2015 Mathieu Chartier <mathieuc@google.com> Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"

Bug: 19735273

This reverts commit 3abfcfc17b022a5af9d37403f81fae027ab850b9.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
/build/make/core/main.mk
7c2d49dcb9eeb4a53d95f7eceb55637fdd1afa35 17-Mar-2015 Mathieu Chartier <mathieuc@google.com> am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"

* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
3abfcfc17b022a5af9d37403f81fae027ab850b9 17-Mar-2015 Mathieu Chartier <mathieuc@google.com> Rename dalvik.vm.usejit to debug.dalvik.vm.usejit

Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
/build/make/core/main.mk
f738b3bb9f48cef64e9520512d93b7bfd90ca137 13-Feb-2015 Ying Wang <wangying@google.com> Load cts/build/config.mk after build/core/config.mk

So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008e4361d810895dd251354ac348cbf27)
/build/make/core/main.mk
0694eabe4de8231932a559498ee7784568794f81 12-Mar-2015 Mathieu Chartier <mathieuc@google.com> JIT default opt-in

Bug: 17950037

(cherry picked from commit 2a2a03046ecea689ff8cc86b80c27c24905c2d60)

Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
/build/make/core/main.mk
2a2a03046ecea689ff8cc86b80c27c24905c2d60 12-Mar-2015 Mathieu Chartier <mathieuc@google.com> JIT default opt-in

Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
/build/make/core/main.mk
bacf5f8008e4361d810895dd251354ac348cbf27 13-Feb-2015 Ying Wang <wangying@google.com> Load cts/build/config.mk after build/core/config.mk

So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
/build/make/core/main.mk
3e9b20e4309edb0162d120aecf6a4021c8d1b2d6 04-Feb-2015 Ying Wang <wangying@google.com> am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp

* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
16ba2ed82bc084d5355477a381cc0bcc8b60a7bd 04-Feb-2015 Ying Wang <wangying@google.com> resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp

Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
14cc23d4337c92fd09fa85cee536ca96eb41dd2a 04-Feb-2015 Ying Wang <wangying@google.com> Remove support of factory ramdisk/bundle.

Bug: 18779515
Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
/build/make/core/main.mk
38a9d5a739cb95758e3f40cb240c1511a309d4f7 31-Jan-2015 Ying Wang <wangying@google.com> am 10500d0e: resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp

* commit '10500d0ea7706a6a137e8afdd347d927f5512488':
Add target recoveryimage-nodeps.
10500d0ea7706a6a137e8afdd347d927f5512488 31-Jan-2015 Ying Wang <wangying@google.com> resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp

Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62
747b9f18f0d0c542fbd02d229265dbe172e54ae9 30-Jan-2015 Ying Wang <wangying@google.com> Add target recoveryimage-nodeps.

Change-Id: Ie7d11ae8f40260bf23481931c18523895c87ebd7
/build/make/core/main.mk
4d26681f3d7d2a3ae8e2ab326d9d2d11b55d7297 22-Jan-2015 Ying Wang <wangying@google.com> resolved conflicts for merge of 0f205ad9 to master

Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
8b62f12195510bcb239e1f5ae15f77d7213e013a 22-Jan-2015 Christopher Ferris <cferris@google.com> am 9f9ccbfd: Merge "Fix missing parenthesis."

* commit '9f9ccbfd6a84e56df00c49b0aec25236b702e01d':
Fix missing parenthesis.
a8f5b8d0e23554984dc336638f8357be3c224924 21-Jan-2015 Christopher Ferris <cferris@google.com> Fix missing parenthesis.

Change-Id: Ib9eda50a6f9096dad35cf81ac3b3cdc26636a016
/build/make/core/main.mk
f1db7e23d91a8c080a7d0fdcaba9c04694b9aee6 18-Dec-2014 Ying Wang <wangying@google.com> Support to build AAR for static Java libraries.

Set up rules to build $(built_aar), if a static Java library has Android
resources.
If you run "tapas my_lib && make dist", my_lib.aar will be built and put
in the DIST_DIR.

Bug: 18759503
Change-Id: I36b912eb7bbab241fe48319115ea320efe77c705
/build/make/core/main.mk
912da64598a5175d6e5868c22977eda95f2a9df1 16-Dec-2014 Ying Wang <wangying@google.com> am 73a730ca: Merge "Remove libdvm support from the core build system."

* commit '73a730caf566fb778ad36f6d991666c482918d22':
Remove libdvm support from the core build system.
d54520a667e3bd5c9f2abe98573a5de83bcf4872 08-Dec-2014 Ying Wang <wangying@google.com> Remove libdvm support from the core build system.

Now libart is the only supported runtime and
we don't need the build variables PRODUCT_RUNTIMES and
DALVIK_VM_LIB.

Bug: 18465297
Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
/build/make/core/main.mk
296fb4c77cf04aeb6ffdcdd5a94578a180f7a3a2 14-Nov-2014 Ian Rogers <irogers@google.com> am 93efec89: Merge "Pass instruction set variant to dex2oat."

* commit '93efec89e067c5fe6f4585a5f0f033826310ee76':
Pass instruction set variant to dex2oat.
a18a28305d5bf2176f8aff197cf18cde81539379 17-Oct-2014 Ian Rogers <irogers@google.com> Pass instruction set variant to dex2oat.

Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890

Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
/build/make/core/main.mk
4606ae776b628a3021dc3a82fb0699f68e30921c 06-Nov-2014 Ian Rogers <irogers@google.com> am b78348d5: am 5968de73: Merge "Remove stale dexopt flags."

* commit 'b78348d5b49ab2899b414d5700f0d7e6e797dfc6':
Remove stale dexopt flags.
b78348d5b49ab2899b414d5700f0d7e6e797dfc6 06-Nov-2014 Ian Rogers <irogers@google.com> am 5968de73: Merge "Remove stale dexopt flags."

* commit '5968de73fb78e2ca8f32ab0588cac92f74a0435e':
Remove stale dexopt flags.
9c7fc4b3259b21198039c82ff1e1e398197bab3c 05-Nov-2014 Ian Rogers <irogers@google.com> Remove stale dexopt flags.

Change-Id: Ib58d39012eabd5f854b9434ab922340fcfe43b57
/build/make/core/main.mk
4b642748dd41d8bd1f7a2c8de6e467a01cabae43 29-Oct-2014 Neil Fuller <nfuller@google.com> am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support"

* commit 'acd65c7db0212bff2b7b1878a26b7a105522cd44':
Add OpenJDK 8 experimental support
c5c60e2c2af542294d38dc0e2284115a62dbb310 29-Oct-2014 Neil Fuller <nfuller@google.com> am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"

* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
Remove Java 6 build support
acd65c7db0212bff2b7b1878a26b7a105522cd44 28-Oct-2014 Neil Fuller <nfuller@google.com> am 97ef1d46: Merge "Add OpenJDK 8 experimental support"

* commit '97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
83cd45517dba2949f4fafe539ecb8238947bee8c 28-Oct-2014 Ying Wang <wangying@google.com> Store symbols.zip in apps_only build. automerge: a60fb49
automerge: a73b611

* commit 'a73b611e6b2a626b144170f15509e02f3318976e':
Store symbols.zip in apps_only build.
a60fb49704946b9d5cf0551ddd56bd1072131b85 24-Oct-2014 Ying Wang <wangying@google.com> Store symbols.zip in apps_only build.

Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
/build/make/core/main.mk
f7ce9508dec85c67d3a2ebe84db073a01355eba5 24-Oct-2014 Neil Fuller <nfuller@google.com> am 4dfda1fa: Merge "Remove Java 6 build support"

* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
Remove Java 6 build support
960f22c11dc282ef872080f8c1ad50bdff4a99ad 16-Oct-2014 Neil Fuller <nfuller@google.com> Add OpenJDK 8 experimental support

Targeting 1.7: just adding support for the tools.

Various issues exist with OpenJDK 8: it doesn't build to completion
yet.

Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
/build/make/core/main.mk
46e00ea4ba3cddfd9792b501d30d95d93828dd66 16-Oct-2014 Neil Fuller <nfuller@google.com> Remove Java 6 build support

Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
/build/make/core/main.mk
ec70fdaa35dc5352e65b76601b36294f5af649df 04-Oct-2014 Andreas Gampe <agampe@google.com> am d8a89a88: am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev

* commit 'd8a89a8847897dd3c0a2b05dcc09c6f3ccc44c8f':
Build: Do not set interpreted mode for SDK build
783e667b2a18b78de5fda32992a74e1601e90403 04-Oct-2014 Andreas Gampe <agampe@google.com> am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev

* commit 'c776f06379929f1e1b9d1f4bb0749faf36e19670':
Build: Do not set interpreted mode for SDK build
2abc44c2fe30760aac0051a3a2f43ad0baeae05e 03-Oct-2014 Andreas Gampe <agampe@google.com> Build: Do not set interpreted mode for SDK build

In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.

Bug: 17796919

Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550
/build/make/core/main.mk
4d0595b596e7685156de8291b2da89742aee7e32 20-Sep-2014 Brian Carlstrom <bdc@google.com> am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"

* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
da51aa7a13bdedfec4d35f57371fbda3d56f8904 20-Sep-2014 Brian Carlstrom <bdc@google.com> am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"

* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
85d56eba9911ec7550a53ef247455c79a58102a7 19-Sep-2014 Brian Carlstrom <bdc@google.com> Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug

Bug: 17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
/build/make/core/main.mk
371acf350f63557afa6589533b3d6a1edbd4fe49 26-Aug-2014 Calin Juravle <calin@google.com> am e8892aa4: Merge "Push ISA features into system properties" into lmp-dev

* commit 'e8892aa4ec043fa86fe6c0dbe58f8586fd636bcd':
Push ISA features into system properties
68b246401de6132861b12d28581628ccaa780ca9 19-Aug-2014 Calin Juravle <calin@google.com> Push ISA features into system properties

We need to know instruction set featues at runtime as well so that the
apps get compiled on target with the proper features. The properties are
read by installd and passed to dex2oat.

Bug: 16716262

(cherry picked from commit 28be9d8884861f70fbd39b3768a6d4b34009deed)

Change-Id: I45b363558dea17e9b049e4a83a55990b4911d9d8
/build/make/core/main.mk
28be9d8884861f70fbd39b3768a6d4b34009deed 19-Aug-2014 Calin Juravle <calin@google.com> Push ISA features into system properties

We need to know instruction set featues at runtime as well so that the
apps get compiled on target with the proper features. The properties are
read by installd and passed to dex2oat.

Bug: 16716262
Change-Id: Ia73f2055f696880d45a63a0d6e0ee98d37a01113
/build/make/core/main.mk
cced082f5d8e6386815a5cfba125789e78c5e7ca 29-Jul-2014 Brian Carlstrom <bdc@google.com> Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
/build/make/core/main.mk
479eca858c85fb0a6cfa073012dba1dee6906030 04-Aug-2014 Brian Carlstrom <bdc@google.com> resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp

Change-Id: Id37b96441818c5542b8c340f968183162a47191a
4d30e5e2604a77df2acd41e36cbca54cd42cbf0a 29-Jul-2014 Brian Carlstrom <bdc@google.com> Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
/build/make/core/main.mk
495630f65309051ef53f17ded84ecf1dc864030a 30-Jul-2014 Ying Wang <wangying@google.com> Don't fail the build for dangling module names.

Change-Id: I939253552e7ca6a672f662ae6be3eac41f5bab41
/build/make/core/main.mk
06940df71383b5acfdfdf9d4d4cf6e30090dfa7c 17-Jul-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp

Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
b2be5ffdeda3a33d454dc7ee1b22578d1c3cff52 17-Jul-2014 Ying Wang <wangying@google.com> Remove linker64 and debuggerd64

We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.

Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
/build/make/core/main.mk
1a9e1b43e9b57a87291a83fe105c383d331803d5 24-Jun-2014 Ying Wang <wangying@google.com> am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."

* commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954':
Resolve :32 to 32-bit variant only if the variant exists.
daaec135b4d141335fc1f4e3edf9eb526c9f6954 24-Jun-2014 Ying Wang <wangying@google.com> am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."

* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
Resolve :32 to 32-bit variant only if the variant exists.
7e73eb3f7cd8e6010df2c62c4d380cdc34ba3edc 24-Jun-2014 Ying Wang <wangying@google.com> Resolve :32 to 32-bit variant only if the variant exists.

Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
/build/make/core/main.mk
a1ac47367636c0473156679f8f30af626df7da85 18-Jun-2014 Colin Cross <ccross@android.com> am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"

* commit 'b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
bf2f0c729bd496599bd6a6103105e7985a521e66 18-Jun-2014 Colin Cross <ccross@android.com> am a1ac4736: am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"

* commit 'a1ac47367636c0473156679f8f30af626df7da85':
build: delete 64-bit blacklist
ae2986e51a52833deac6c03f55924e3271e3586d 18-Jun-2014 Colin Cross <ccross@android.com> build: delete 64-bit blacklist

The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
/build/make/core/main.mk
0d26882d858a9b3298c74d5ffdf1cf758c975b42 11-Jun-2014 Ying Wang <wangying@google.com> am 2ebf7c1c: am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."

* commit '2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475':
Check existence of both 64-bit and 32-bit module variants.
01c4f4622b3fda662bccda1ee795cf71ebbd1234 11-Jun-2014 Ying Wang <wangying@google.com> am dceddd91: am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."

* commit 'dceddd91d9a6516346e752b9f942747bea931cfa':
Fix loophole in module expansion.
2ebf7c1c5f3e04f13fa7d80dcc5d060306a8a475 11-Jun-2014 Ying Wang <wangying@google.com> am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."

* commit '6b468193536c1925944ccbf6269ee057e080aef4':
Check existence of both 64-bit and 32-bit module variants.
dceddd91d9a6516346e752b9f942747bea931cfa 11-Jun-2014 Ying Wang <wangying@google.com> am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."

* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
ff3a9045229b0613552e45de2a31a7ac8debb597 11-Jun-2014 Ying Wang <wangying@google.com> Check existence of both 64-bit and 32-bit module variants.

- Do the module name resolving for both host and target modules.
- Check existence of both 64-bit and 32-bit module variants.

Change-Id: I8ada0e734efac6c8dafade8708fff9797b19a78d
/build/make/core/main.mk
e1b867dde77d59bb35f366c2e3d65fe37c696880 10-Jun-2014 Ying Wang <wangying@google.com> Fix loophole in module expansion.

Previously we only expanded product_MODULES with LOCAL_REQUIRED_MODULES,
but not modules introduced by LOCAL_SHARED_LIBRARIES; Later we did a further
shared libary expansion in vendor_module_check.mk.
It couldn't track C in the following case:
A : B, by LOCAL_SHARED_LIBRARIES; B : C, by LOCAL_REQUIRED_MODULES.

With this change, we transformed the LOCAL_SHARED_LIBRARIES dependencies
into LOCAL_REQUIRED_MODULES dependencies before doing the required
module expansion and the loophole is closed.
All module names are now expanded to product_MODULES now and it makes
vendor_module_check.mk simpler.

Change-Id: I8835a478d2ce0ce10601a8449f446f07b01c2b7f
/build/make/core/main.mk
c93c03081bd86bc003bc0eb0655d82e20503cd17 29-May-2014 Brian Carlstrom <bdc@google.com> am ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"

* commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
Only enable WITH_DEXPREOPT by default for libdvm.so
3f5ff08dc5cd3b3615d35a2bf1e6f89fefcc6657 29-May-2014 Brian Carlstrom <bdc@google.com> Only enable WITH_DEXPREOPT by default for libdvm.so

Bug: 14298175

(cherry picked from commit 9f8e214a919097284a88cb19a1b85ceafc202a67)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
/build/make/core/main.mk
e469ea36ffa88a4ee7e2a63228eae8be9e7083fb 29-May-2014 Brian Carlstrom <bdc@google.com> am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so

* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
Only enable WITH_DEXPREOPT by default for libdvm.so
9f8e214a919097284a88cb19a1b85ceafc202a67 29-May-2014 Brian Carlstrom <bdc@google.com> Only enable WITH_DEXPREOPT by default for libdvm.so

Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
/build/make/core/main.mk
1dc4f0bacef15631d5390af4ee0b898e0e07c9d5 23-May-2014 Ying Wang <wangying@google.com> am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"

* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
2bf10a72f87a8e97923286aa331f7db81e2361ca 23-May-2014 Ying Wang <wangying@google.com> am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build"

* commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
9734252ccf26fd3067d68719d8476b48acc07a2f 22-May-2014 Ying Wang <wangying@google.com> Don't build tests in PDK build.

Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
/build/make/core/main.mk
c2c368fb76ba6cd3593d17922f53079e0b630a03 21-May-2014 Ying Wang <wangying@google.com> check build tests modules in eng and userdebug builds

To catch more build breakage, check build tests modules in eng and
userdebug builds.

Change-Id: Ic3b34dcd199e50e555c33eb686a501acef59a8c2
/build/make/core/main.mk
966c1e0cae6a59f15264d3b542af08e21e2dc06c 20-May-2014 Ying Wang <wangying@google.com> Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build

We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.

Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
/build/make/core/main.mk
8200231ae1891fdb3bba8ff4cefbaea88dbbe61b 15-May-2014 Ying Wang <wangying@google.com> am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"

* commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553':
Support host multilib build
e50f2d9f32a27d8290692dbf99ab8b247ef9d553 15-May-2014 Ying Wang <wangying@google.com> am 40b49d30: am a74ade94: Merge "Support host multilib build"

* commit '40b49d3043bd41ca5548b99b537038187fdca258':
Support host multilib build
6feb6d5607ce86a446645564212043964628f540 17-Apr-2014 Ying Wang <wangying@google.com> Support host multilib build

This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
/build/make/core/main.mk
edc702c7d6d44222a30fad5492aca916d48f0da2 11-May-2014 David 'Digit' Turner <digit@google.com> am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
873782ccd44349c766f5d74e65b3b323618dd6ed 11-May-2014 David 'Digit' Turner <digit@google.com> am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit '9e3259f50d6aa2ca4430430d71d2fffd58662650':
Disable emulator from platform builds.
envsetup.sh: Use prebuilt emulator binaries if available.
f6e2694dd24d54a93d3c9adb633e0776cedb1049 09-May-2014 David 'Digit' Turner <digit@google.com> Disable emulator from platform builds.

Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.

NOTE: This patch should be applied after this one to avoid issues
with the GPU emulation libraries:
https://android-review.googlesource.com/93980

Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
/build/make/core/main.mk
af3f1a54545dadc4606b74e16416712fbd3efecf 09-May-2014 Ying Wang <wangying@google.com> am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""

* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
Target "tests" now only builds the modules tagged as "tests"
07b2055d3e4b2db2e0cdddc13f8f992d81c06ffb 08-May-2014 Ying Wang <wangying@google.com> Target "tests" now only builds the modules tagged as "tests"

But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
/build/make/core/main.mk
151c5060c923a847f64629071e10d2eed929609a 09-May-2014 Ying Wang <wangying@google.com> Merge "Target "tests" now only builds the modules tagged as "tests""
0e183b2d33f66477a2672d58d2a062e7aeb00c33 09-May-2014 Brian Carlstrom <bdc@google.com> am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"

* commit '676c8f0450a9dfb84c12257195ba05619aeed970':
Add dalvik.vm.dex2oat-flags for eng build
676c8f0450a9dfb84c12257195ba05619aeed970 08-May-2014 Brian Carlstrom <bdc@google.com> am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"

* commit '4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
571fee8985746659c4d39ef613d659e6124c66af 08-May-2014 Ying Wang <wangying@google.com> Target "tests" now only builds the modules tagged as "tests"

But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
/build/make/core/main.mk
fceb115bd6601a64c0510cba5ff2041d060cf610 11-Feb-2014 Brian Carlstrom <bdc@google.com> Add dalvik.vm.dex2oat-flags for eng build

Bug: 12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
/build/make/core/main.mk
51f0d3f58a5c04ee328778bc97e42dc10cfa41ad 15-Apr-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of 70555a16 to master

Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
70555a1677100326b7cf6d503681e0ef52c82154 15-Apr-2014 Ying Wang <wangying@google.com> am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev

* commit 'fcd22c8848b829eec7e661fb270fea1a18bcba28':
Allow to build target-files.zip in sdk build.
4709d7c3a5239d9d073a7d536385596ea18981a9 15-Apr-2014 Ying Wang <wangying@google.com> Allow to build target-files.zip in sdk build.

and put the target-files.zip on the build server.

Bug: 13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
/build/make/core/main.mk
38568b424d3139c6d590f9b3d7961e16b8795dc2 25-Mar-2014 Alan Viverette <alanv@google.com> Preserve symlinked OUT_DIR by only clearing contents

Change-Id: I824ecd46d7fd31885024ff20cf5cbd52e2cbb713
/build/make/core/main.mk
821b37d8174f2497153dfb8fcde7b8f84618e111 05-Apr-2014 Ying Wang <wangying@android.com> am 0df45b08: am 260942fa: Merge "Build with java7 by default."

* commit '0df45b0898710a2e7ddd723fae450ad701a4614d':
Build with java7 by default.
c84889b80ae40dec85ac4810fc500db70cbc82b2 01-Apr-2014 Narayan Kamath <narayan@google.com> Build with java7 by default.

All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
the more general version check.
- Update the link in the version check error message to the
"initializing" page instead of the "download" page. The latter
talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
core/main.mk
/build/make/core/main.mk
422fadcf79dee6846c341b856180314c04cce3ed 01-Apr-2014 Narayan Kamath <narayan@google.com> Build with java7 by default.

All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
the more general version check.
- Update the link in the version check error message to the
"initializing" page instead of the "download" page. The latter
talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
/build/make/core/main.mk
8700eb6049f176045d5a231b944ba27d3eb728ea 03-Apr-2014 Ying Wang <wangying@google.com> am 88e1a110: am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."

* commit '88e1a1103acaf5e61fd11a7c006a0c465214ac78':
Unset _JAVA_OPTIONS before running "java -version".
88e1a1103acaf5e61fd11a7c006a0c465214ac78 03-Apr-2014 Ying Wang <wangying@google.com> am 680e0370: am 59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."

* commit '680e037007fd0f4207a4734b8fccce17a91ee682':
Unset _JAVA_OPTIONS before running "java -version".
8a52b231d24c0fdfdf229ecb1706e78a1885c118 03-Apr-2014 Ying Wang <wangying@google.com> Unset _JAVA_OPTIONS before running "java -version".

Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.

Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
/build/make/core/main.mk
bfc9b30d36cfbd5c01a0ff0aa7333f81e2033003 02-Apr-2014 Narayan Kamath <narayan@google.com> am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."

* commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
Add warning message for java6 builds.
bee0ec41965cd2d12537d80896d1e25ca47c81d2 17-Feb-2014 Narayan Kamath <narayan@google.com> Add warning message for java6 builds.

The instruction URL has been amended and a few additional
details have been added.

(cherry picked from 8c06afdea3d3c422d653b40fd19d5e3d4be64af2)

Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
/build/make/core/main.mk
839d2829bcf2ddc7aaf04f6305b4b6858962896d 02-Apr-2014 Narayan Kamath <narayan@google.com> am 35200762: am e28df19e: Merge "Call "java[c] -version" only once"

* commit '35200762980aa2c0f90e73e38af94fd29b50f91f':
Call "java[c] -version" only once
823f0ba6b8b52566d453d4770ac4e09f89b90842 02-Apr-2014 Narayan Kamath <narayan@google.com> am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."

* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
Bring main.mk in sync with master.
8d45e51803c0ca5194b07e493cb231e3a52db2ca 14-Nov-2013 Ying Wang <wangying@google.com> Call "java[c] -version" only once

and print out the full output if error occurs.
Bug: 11672548

(cherry picked from 7b66d366bf5c469130f71d0870424fcd265e0301)

Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
/build/make/core/main.mk
d5fb7826823fa3fb45f8f06c9c1a781dd60210f8 01-Apr-2014 Narayan Kamath <narayan@google.com> Bring main.mk in sync with master.

These lines were removed in aosp in commit e2d27887b
but a bad merge conflict resolution left them in master.

Subsequent changes on master started using these variables
so they're being brought back.

Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
/build/make/core/main.mk
710e0265bc5f70398e7c070941ae6af34bf5c5d5 01-Apr-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of f966bda4 to master

Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
f966bda49f4fdf749c91b30e9819c85ca9dab063 01-Apr-2014 Ying Wang <wangying@android.com> am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."

* commit '4714d3d7a604391d174049a7a595e80ebab2da18':
Fix java version detection when _JAVA_OPTIONS is set.
bb406bf4c059fac41bd91038e7a2d2725068c057 01-Apr-2014 Peter Ammon <pca@google.com> Fix java version detection when _JAVA_OPTIONS is set.

_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.

Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
/build/make/core/main.mk
9c2daa97e109b2c38789371d6eaa113277cab5ac 21-Mar-2014 Narayan Kamath <narayan@google.com> Merge "Add warning message for java6 builds."
81717cc251d6890f5bf3fa042bd11d20c7ec556c 20-Mar-2014 Ying Wang <wangying@google.com> am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
Remove the redundant DISABLE_DEXPREOPT
996f3826f7005cf207c8565f674ee38df1ada153 20-Mar-2014 Ying Wang <wangying@google.com> am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
c6848b398d776ca2303d5a6c225c6339a89e67f7 20-Mar-2014 Ying Wang <wangying@google.com> Remove the redundant DISABLE_DEXPREOPT

To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
/build/make/core/main.mk
8c06afdea3d3c422d653b40fd19d5e3d4be64af2 17-Feb-2014 Narayan Kamath <narayan@google.com> Add warning message for java6 builds.

Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8
/build/make/core/main.mk
557282dbc4db5bf2023c2e69a58a6f0d326280e2 26-Feb-2014 Ying Wang <wangying@google.com> am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit '332bbced6d075eccdf54b00d4178afc59db6f096':
Conditionally include the 'samplecode' rules.
a8d273d3ce1d062c55dd936ab17792c7494643ca 26-Feb-2014 Ying Wang <wangying@google.com> am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
48fbc42f93ea0913634f94d815a8937248317012 26-Feb-2014 Ying Wang <wangying@google.com> Conditionally include the 'samplecode' rules.

Not sure goal 'samplecode' is still used by anybody these days.

Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
/build/make/core/main.mk
43d524854acf54e7de065d71d649f047a3283210 25-Feb-2014 Tsu Chiang Chuang <tsu@google.com> add exception to be able to build emulator_tests in conjunction with the
sdk.

Change-Id: Ic4c63c756c78da97657e08faa5b4b6891b951b03
/build/make/core/main.mk
6d5ca9f46bbb3e06a69e1b6465d4fa969fb2ed77 18-Feb-2014 Ying Wang <wangying@google.com> am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
Make the module existence check nonfatal
52cefc36cf4718cd85e6e35832b2a8674ba9e838 18-Feb-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
b1d75bd81d7585135eb7ce8d99d4d781925791dd 14-Feb-2014 Ying Wang <wangying@google.com> Make the module existence check nonfatal

Now we have sdk variants that may inherit the non-existent module names
from the device product.

Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
/build/make/core/main.mk
1fd8265d1a1a48d8c1805553669bbefb32956deb 14-Feb-2014 Ying Wang <wangying@google.com> am 1e8fec5b: am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."

* commit '1e8fec5baea381604a2bf197bfb091eeb7aa36ef':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
940d68af5324d3241a65301e31cb12900b49ac96 14-Feb-2014 Ying Wang <wangying@google.com> Don't check the existence for the 64-bit modules for 32-bit SDK build.

Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
/build/make/core/main.mk
84a20ac12e07109f5682d77a131f25995f7c2d0e 13-Feb-2014 Colin Cross <ccross@android.com> am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp

* commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e':
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
e6a65a5f15695f4e601110979dc6861773c3444d 12-Feb-2014 Ying Wang <wangying@google.com> resolved conflicts for merge of b6d53f0b to master

Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
6336d6bf07f0c43f1675cbd99a887e572b4625e8 12-Feb-2014 Ying Wang <wangying@google.com> am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build"

* commit '1968f286d69c36692bd5788fa8745ed16ccc03cb':
Refine module name resolving in multilib build
02e31d240a9044b54ee793902ad958894f84e7a1 24-Jan-2014 Colin Cross <ccross@android.com> HACK: add 64-bit directory blacklist

Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
/build/make/core/main.mk
bec954d05e0eeec178c796d2332ee9a86becb5dc 12-Feb-2014 Ying Wang <wangying@google.com> Merge "Clean up dangling module names"
d18e570fbaef9fdc6605ed75960641416a370a79 12-Feb-2014 Ying Wang <wangying@google.com> Clean up dangling module names

Those modules have disappeared from the source tree.

https://code.google.com/p/android/issues/detail?id=61210

Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
/build/make/core/main.mk
14a6cbd9026659b30f63c31e112d6cce9b47a9d6 11-Feb-2014 Ying Wang <wangying@google.com> Refine module name resolving in multilib build

-- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an
executable, if LOCAL_NO_2ND_ARCH is not true.

Name resolving in 64-bit multilib build:
-- Name resolving in PRODUCT_PACKAGES:
foo:32 resolves to foo_32;
foo:64 resolves to foo;
foo resolves to both foo and foo_32 (if foo_32 is defined).

-- Name resolving for LOCAL_REQUIRED_MODULES:
If a module is built for 2nd arch, its required module resolves to
32-bit variant, if it exits;
Otherwise for executable and shared library, a required module
resolves to the default 64-bit variant; for other module classes,
required module foo resolves to both foo and foo_32 (if foo_32 is
defined)

Bug: 12898862
Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
/build/make/core/main.mk
fc33037547495aa21b25216d360b27a7100e2a42 01-Feb-2014 Ying Wang <wangying@google.com> Dedup the targets and dependencies of required modules.

For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
/build/make/core/main.mk
3136010cddcfbb20bdbc6d74d33fcc06f535dd47 01-Feb-2014 Ying Wang <wangying@google.com> Dedup the targets and dependencies of required modules.

For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
/build/make/core/main.mk
4d2cc665eafb16ffe20b4ec8b2b2fc3a55f6f6ae 16-Jan-2014 Ying Wang <wangying@google.com> Set up rules to build shared libraries for TARGET_2ND_ARCH

The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
/build/make/core/main.mk
0cf57dc99f7040a96e8d3da646adace12bcb58c7 21-Jan-2014 Brian Carlstrom <bdc@google.com> Add missing paren in "java -version" check

Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
/build/make/core/main.mk
791fa6a9094dced42b4b292c163708838a8d059e 16-Jan-2014 Ying Wang <wangying@google.com> Set up rules to build shared libraries for TARGET_2ND_ARCH

The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
/build/make/core/main.mk
1d755aaa7b40254d4ebb40d5b970e8f17a0de0c0 06-Dec-2013 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 6835cbf9 to master

Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7
e2d27887bef08b9c3297e765d32397c1a8f7df87 05-Dec-2013 Narayan Kamath <narayan@google.com> A few more Java7 related clean ups.

- Separate SDK checking from version checking and
make messages clearer.
- Add explicit source & target versions for javac to
make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
/build/make/core/main.mk
13ca2c7f5cea350722634de07fad0c27aa276b86 03-Dec-2013 Ying Wang <wangying@android.com> am 71e5dd30: am 7a772619: Merge "core: support make 4.00"

* commit '71e5dd3055dc6a441ce20f0905f1b3893f79d27e':
core: support make 4.00
7a77261988354b13996e5ba84b87351b571a5a52 02-Dec-2013 Ying Wang <wangying@android.com> Merge "core: support make 4.00"
ad6909913145ba3daeb037f0170b95f855f7d08f 21-Sep-2013 Ying Wang <wangying@google.com> Add experimental flag to support OpenJDK builds.

bug: 8992787

(cherry picked from commit d1dbe7f5a23bacdff086b4992e1d31a96da706c3)

Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
/build/make/core/main.mk
b9041a45b1f030d3e374420aa95e44f4c3029fb4 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD

Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
7b66d366bf5c469130f71d0870424fcd265e0301 14-Nov-2013 Ying Wang <wangying@google.com> Call "java[c] -version" only once

and print out the full output if error occurs.
Bug: 11672548

Change-Id: Iba217789f7ab69d73902a4dc82e8975b2f6a48fc
/build/make/core/main.mk
2773ab94d7d0d51e70c6adbb6fb942a859d1993e 07-Nov-2013 Elliott Hughes <enh@google.com> am 36e681b0: resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp

* commit '36e681b02a7cd2554f038bcac65d7fdfc7889273':
Remove the hacks needed to support ash and mksh concurrently.
36e681b02a7cd2554f038bcac65d7fdfc7889273 07-Nov-2013 Elliott Hughes <enh@google.com> resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp

Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
12f87a5b7728d4e5af251c33f448ac7fc1868abb 07-Nov-2013 Elliott Hughes <enh@google.com> am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."

* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
Remove the hacks needed to support ash and mksh concurrently.
32bfd70333b72646909ccbcf50217b5a275912da 05-Nov-2013 Elliott Hughes <enh@google.com> Remove the hacks needed to support ash and mksh concurrently.

We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
/build/make/core/main.mk
d1dbe7f5a23bacdff086b4992e1d31a96da706c3 21-Sep-2013 Ying Wang <wangying@google.com> Add experimental flag to support OpenJDK builds.

bug: 8992787

Change-Id: Ice0fc7dea1d855914fdab9a01b1ac9c722031288
/build/make/core/main.mk
2b537262fe884c11d7d27d208896a0849e72bd73 16-Oct-2013 synergydev <synergye@codefi.re> core: support make 4.00

Make 4.00 is now out, and builds work fine with it.

Change-Id: I49e36d651a7997a52270badb0e8badd975f64e8f
/build/make/core/main.mk
253555b5e3ce7119e25159a5c2a05289abb8869f 02-Oct-2013 Mike Lockwood <lockwood@google.com> "make dist" should not try to package apps for embedded builds

Change-Id: Icbe522737f7b8a44c8a458b32678fe0472b94dff
/build/make/core/main.mk
293ad10d252e9a076990400f1302e200e2badf53 07-Jun-2013 Ying Wang <wangying@google.com> Remove unnecessary dependencies between host and target modules.

With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
/build/make/core/main.mk
20ef354e8c3a1fc10515a469fcc615935e6fb7cb 09-Sep-2013 Ying Wang <wangying@google.com> Load the ONE_SHOT_MAKEFILE even in dont_bother mode

This makes "mmm <path> snod" work again.
Note that snod has dependency on the rest of the command line goals,
which is all_modules for ONE_SHOT_MAKEFILE,
so build race condition is avoided.

Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
/build/make/core/main.mk
39e08f2827584111f1cb2487ac7a1aae95df7ff0 09-Sep-2013 Ying Wang <wangying@google.com> Delete dead code.

frameworks/policies/base/PolicyConfig.mk does no longer exist.

Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
/build/make/core/main.mk
495f68402493de82606b8c06213bae5bb1156a8b 28-Aug-2013 Ying Wang <wangying@google.com> In apps_only build dist a module only if it has a BUILT file.

This allows you to specify a PHONY target in TARGET_BUILD_APPS.

Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
/build/make/core/main.mk
62c81f821f3675ea57485bfa6cb3320b7178759e 23-Aug-2013 Ying Wang <wangying@google.com> Collect NOTICE files for apps_only build.

In apps_only build (after running tapas or exporting TARGET_BUILD_APPS),
run "make notice_files" to collect and combine the NOTICE files of
modules that are needed by the apps.

Bug: 10445634
Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
/build/make/core/main.mk
b6cf5b2f41d460405a0a22812255b2700a79fb20 23-Aug-2013 Ying Wang <wangying@google.com> am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
Collect and store proguard obfuscation dictionary files.
ae9115a525260a0ca317eadd13f075def733a66d 23-Aug-2013 Ying Wang <wangying@google.com> Collect and store proguard obfuscation dictionary files.

Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.

Bug: 9407666
Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
/build/make/core/main.mk
c3e977acf150c54a73d7a4cd7f5d47474a122a66 23-Aug-2013 Ying Wang <wangying@google.com> am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev

* commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c':
Revert "Collect and store proguard obfuscation dictionary files."
58ad70618d4d21f16ffe89c1e0eea7e35eae918b 23-Aug-2013 Ying Wang <wangying@google.com> am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit '93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4':
Collect and store proguard obfuscation dictionary files.
df8b48449a0a607249d05aa420e41d0b3470ed63 23-Aug-2013 Ying Wang <wangying@google.com> Revert "Collect and store proguard obfuscation dictionary files."

This reverts commit 41dbe1e535c1aea9a4c4cec6be637fe1b882220b.

Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
/build/make/core/main.mk
41dbe1e535c1aea9a4c4cec6be637fe1b882220b 23-Aug-2013 Ying Wang <wangying@google.com> Collect and store proguard obfuscation dictionary files.

Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.

Bug: 9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
/build/make/core/main.mk
a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0 16-Aug-2013 Ying Wang <wangying@google.com> Add phony goal GET-INSTALL-PATH

It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.

Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
/build/make/core/main.mk
ad7fd29b312bf588b2be3f799715f34ff8a6d46b 09-Aug-2013 Ying Wang <wangying@google.com> Don't bother going through the source tree

Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.

Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
/build/make/core/main.mk
16b92edc386a4616b813af392ba54ad9e2c05ca7 07-Jun-2013 Ying Wang <wangying@google.com> Remove unnecessary dependencies between host and target modules.

With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
/build/make/core/main.mk
172f5f57460001b78e100cefa584d8e91738e48a 31-Jul-2013 Ying Wang <wangying@google.com> More verbose on what the build system is doing

Sometimes users get confused for long time of no message printed to the
screen.

Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
/build/make/core/main.mk
54d9cc3fac3c0b420600bf8f64320394e6af2dd3 26-Jul-2013 Ying Wang <wangying@google.com> am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.

* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
Put a copy of the radio/bootloader files in the dist dir.
94de1eba0e87297421789b339c5f26bf3e48eeb1 26-Jul-2013 Ying Wang <wangying@google.com> Put a copy of the radio/bootloader files in the dist dir.

Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
/build/make/core/main.mk
1390cac3cea58f1c5c738bf875b4de5ba4d68fa4 12-Jul-2013 JP Abgrall <jpa@google.com> core: don't hardcode "out" during findleaves.py invocations.

"out" can be $OUT_DIR

Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
/build/make/core/main.mk
fcec57a1165dc78ca2630c017dd95bddce31e55a 27-Jun-2013 Ying Wang <wangying@google.com> Allow to run checkbuild in sdk build.

Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
/build/make/core/main.mk
951e0f1e8d2530c4cfe4ed71f8f62f1e875912ea 13-Jun-2013 Ying Wang <wangying@google.com> am fe365531: am 1e1241ce: Dist static Java library modules.

* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5 13-Jun-2013 Ying Wang <wangying@google.com> Dist static Java library modules.

With this change, we can build and dist static jar files, as well as
apks.

Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
/build/make/core/main.mk
d72db32f84dbb07b3932321fe9cc101a597b6206 07-Jun-2013 Ying Wang <wangying@google.com> Remove unnecessary dependencies between host and target modules.

With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
/build/make/core/main.mk
237770761fd3d1d4d6a570409b7e4bc1966fb97c 16-Apr-2013 Ying Wang <wangying@google.com> am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev

* commit '8150cfcb209dfb6ad86413cf3d4373d074f54062':
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
d6b1d61d84a95ba74bb3e4f9053014357ac363d1 16-Apr-2013 Ying Wang <wangying@google.com> Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES

Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.

Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
/build/make/core/main.mk
b036e955fcd9e5fd15ec37b208e112147641dd7a 12-Apr-2013 Ying Wang <wangying@google.com> Allow to set BUILD_EMULATOR outside the core build system.

For example, you can set it as enviromental variable, command line
makefile variable, or board config variable.

Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502
/build/make/core/main.mk
a0febe5e6de24ffee5cd32944d5a1814cf312efb 20-Mar-2013 Ying Wang <wangying@google.com> Support to build vendor.img

Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
/build/make/core/main.mk
cdfb5bac3a5721b895cea4789ac2384ff6546992 14-Mar-2013 Raphael Moll <raphael@google.com> resolved conflicts for merge of a3aea5b6 to jb-mr2-dev

Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
8a2b7707dd1bc95a69eed3c64415d1b68f2cb669 13-Mar-2013 Raphael Moll <ralf@android.com> Build SDK using prebuilts/devtools.

Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)

Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
/build/make/core/main.mk
512b9628b0cf6dada6188e942d1f4bd5df0308aa 08-Mar-2013 Ying Wang <wangying@google.com> Remove nonexisting module names.

Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
/build/make/core/main.mk
2e65cd5510b4284591905862e5dc1953100d8601 05-Sep-2012 Ying Wang <wangying@google.com> Don't install all host modules by default.

Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
/build/make/core/main.mk
534fcd766ecec602d9437d155066fc5253f1185a 02-Mar-2013 Ying Wang <wangying@google.com> Allow to call dist-for-goals multiple times for the same file

You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.

Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
/build/make/core/main.mk
4dbbd8a37efb93922bc7bc62f341fd29d739383e 25-Feb-2013 Jean-Baptiste Queru <jbq@google.com> am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."

* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
Fixed error message for using OpenJDK.
304f5194fdfd999a5e8bceef1ff260958b041d52 23-Feb-2013 Tim Roes <tim.roes88@googlemail.com> Fixed error message for using OpenJDK.

Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".

Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
/build/make/core/main.mk
50e52fa11e802b4b4a8bf83072323ee48a75436d 23-Feb-2013 Ying Wang <wangying@google.com> Don't run cleanspecs if you are using mm/mmm.

There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.

Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
/build/make/core/main.mk
9485a57bb2e55535fc337f2be803e79cd1c46b62 22-Feb-2013 Ying Wang <wangying@google.com> Untwist the target/host shared library dependencies.

Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.

Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
/build/make/core/main.mk
31268316213d25b73288bee58cef686ba45640c9 22-Feb-2013 Ying Wang <wangying@google.com> Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT

Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by
default. You can set it in your .bashrc or buildspec.mk.

Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
/build/make/core/main.mk
b607f7bd4c270c8bef16db46966992528ce25ebc 09-Feb-2013 Ying Wang <wangying@google.com> mma and mmma

augmented mm/mmm:
Their usages are the same as mm/mmm.
They build not only all modules in given path(s), but also their
dependencies.
With them, to run mm/mmm you don't need to run a full build first now:
Just run mma/mmma first.
Note that mma/mmma need to load all the makefiles in the source tree
so they are much slower than mm/mmm.
You should run mma/mmma the first time, and then mm/mmm for
incremental build.

Bug: 8163814
Change-Id: I554a97c0a23343b65c50870406225eb0064e0651
/build/make/core/main.mk
1d977e318331acdd90a66a972219419cd9508ccf 30-Jan-2013 Ying Wang <wangying@google.com> Refactor calculation LOCAL_CHECKED_MODULE

To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
/build/make/core/main.mk
ef1a9613cb10320365e3a44ba8f131f7989229b3 30-Jan-2013 Ying Wang <wangying@google.com> Revert "Refactor calculation LOCAL_CHECKED_MODULE"

This reverts commit ba99e69424b72ac95581da50c8eea131d398d790

Change-Id: I3c42dea56376d26a5bb77b4944ae17a6875aadbb
/build/make/core/main.mk
ba99e69424b72ac95581da50c8eea131d398d790 30-Jan-2013 Ying Wang <wangying@google.com> Refactor calculation LOCAL_CHECKED_MODULE

To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
/build/make/core/main.mk
ef4d82f283fa279f58f48a0c8a86e40a20bfdcb5 30-Jan-2013 Ying Wang <wangying@google.com> Umbrella build targets to help engineers verify build

With this change, by choosing the right build target, you can reduce
significant verification build time:
If you are working on the framework, "make target-java" sounds enough;
if you are working on native target code, "make target-native" saves
your time by not building the Java code.
This will help reduce uncaught breakges for by default not everything
is built now.

Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
/build/make/core/main.mk
63d94fa3056066ba7be6754356975af6a1c82981 14-Dec-2012 Ying Wang <wangying@google.com> Build from source or prebuilt

With this change, you can easily switch between building from source
code and prebuilt.
Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file,
relative to the top of the source tree, in the usual module definition.
The prebuilt will be used unless any of the followings satisfied:
1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally;
2) The module name is in ANDROID_NO_PREBUILT_MODULES;
3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS.
A developer can set ANDROID_NO_PREBUILT_MODULES or
ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source,
while build other modules from prebuilts.
You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from
source.
Those variables can be set with shell environmental variable or in your
buildspec.mk.

Sometimes module B is able to be built from source only if module A is
also
built from source, for example, if B is the test apk of A.
In that case, you can use the macro include-if-build-from-source to
include B's Android.mk only if A is built from source too, or
if-build-from-source to conditionally include the definition of module
B,
if their module definitions are in the same Android.mk.

Support host-executable-hook and host-shared-library-hook.

Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
/build/make/core/main.mk
60a34ed5011efe7796173a1a63c13d28ae7878fa 09-Nov-2012 Andrew Hsieh <andrewhsieh@google.com> am fc76f0eb: am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"

* commit 'fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1':
Revise checks for MacOSX to build emulator
fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1 09-Nov-2012 Andrew Hsieh <andrewhsieh@google.com> am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"

* commit '2ea957a373018ba6773c621065164256f0d84078':
Revise checks for MacOSX to build emulator
1dcca61869ed1291879332e13771b13805ec4475 09-Nov-2012 Andrew Hsieh <andrewhsieh@google.com> Revise checks for MacOSX to build emulator

1. Check $(HOST_CC) instead of gcc for llvm-gcc.
2. Remvoe Mac SDK 10.4 check because emulator uses
the same SDK version as the rest of framework

Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4
/build/make/core/main.mk
92cd50c41611694281e40dad39a5bc316ef847d8 31-Oct-2012 Ying Wang <wangying@google.com> Remove nonexistent modules from PRODUCT_PACKAGES

and revert back to fatal error if sdk has nonexistent modules.

Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
/build/make/core/main.mk
84da5c55dd4b5dd7925f91864582a616422251e2 24-Aug-2012 Ying Wang <wangying@google.com> Filter out the overridden packages before doing required module expansion.

Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
/build/make/core/main.mk
0cbacc4b2134d59c19d69f90abf75e2e9abb5073 26-Oct-2012 Mike Lockwood <lockwood@google.com> am 86e2fd92: am daf5e22d: Add new embedded target for a super minimal android build

* commit '86e2fd9215faaffed47ab0373b2955d9a1892113':
Add new embedded target for a super minimal android build
86e2fd9215faaffed47ab0373b2955d9a1892113 26-Oct-2012 Mike Lockwood <lockwood@google.com> am daf5e22d: Add new embedded target for a super minimal android build

* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
Add new embedded target for a super minimal android build
daf5e22dbac03e174e22c8209ed97c44c3a2a2c9 18-Oct-2012 Mike Lockwood <lockwood@google.com> Add new embedded target for a super minimal android build

Remove obsolete BUILD_TINY_ANDROID

Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
/build/make/core/main.mk
a7fa6a460790b04883dd0d9e48ff6e40e333eb96 17-Oct-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 37868329 to master

Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
37868329b29ae7c2399860aee1fcf30f6ebd3fa6 17-Oct-2012 Kenny Root <kroot@google.com> am 2e0d1af7: Merge changes I58d43128,Ie34c958f

* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
92ca0197ed22897633ed9241c9f4ae2128ef5c13 16-Oct-2012 Kenny Root <kroot@google.com> Remove HAVE_SELINUX guards, part 2

Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
/build/make/core/main.mk
2d17b1aba6ea529dc618d50c784f69fb7f1a8141 03-Oct-2012 Elliott Hughes <enh@google.com> resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
e37c3dc3f6c46d15113f0e8e4df28e47646995b9 28-Sep-2012 Ying Wang <wangying@google.com> Build only modules required by the current product.

Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
/build/make/core/main.mk
d0244b395a583804137cd1fe2bff4f86d66b396b 17-Nov-2011 Ying Wang <wangying@google.com> Remove build variant "tests"

Bug: 5368571
Now we have a phony target "tests" instead.
The target can be built in any other build variant (eg userdebug).
For example, "make PRODUCT-full-userdebug tests dist" will build and
put the *-test-* zip file in the dist dir.
The "tests" target will include all modules tagged as "tests" in
addition to other modules in specific target out directories.

Change-Id: I8383097380d8e6846c3e2107d6dd5f68788cfc39
/build/make/core/main.mk
5a88269ad6ed44fb163f96847954faac21292567 28-Sep-2012 Ying Wang <wangying@google.com> Build only modules required by the current product.

Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

Bug: 7253452
Change-Id: I84b62116131e85d1f32d58a424cdfd9d51fa9755
/build/make/core/main.mk
b301817223d7163de6827976f8259363ab18c7b8 05-Sep-2012 Ying Wang <wangying@google.com> Don't install all host modules by default.

Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: I326e97df6630dee4acc6582ce6cef2dec8289155
/build/make/core/main.mk
4b0c7230e6cfe1c51f93a7d8279272adee0e68c6 13-Sep-2012 Benoit Goby <benoit@android.com> am a52d50a2: am 063d0c5d: Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev

* commit 'a52d50a235d07229ade4595e0551c1b0409c23be':
Add openssl to TINY_ANDROID build
bc2406e64c9bc046e1d7e971f41c5a350194eb42 01-Sep-2012 Benoit Goby <benoit@android.com> Add openssl to TINY_ANDROID build

adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
/build/make/core/main.mk
dceb47f2e290c41ac118a1d7d9a942f37da43e7a 24-Aug-2012 Ying Wang <wangying@google.com> am 4084c112: am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev

* commit '4084c112e5d073bd0d6875c45939ed7fba62ed14':
Filter out the overridden packages before doing required module expansion.
489458fa3161ed0c299f737da68376862ce13f9f 24-Aug-2012 Ying Wang <wangying@google.com> Filter out the overridden packages before doing required module expansion.

Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
/build/make/core/main.mk
3ea0a81c2bf2ad806a21c1df390751a4b68ebee1 23-Aug-2012 Ying Wang <wangying@google.com> am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev

* commit 'd19511a6657efc7f1a7e544df04f076223f8fe65':
Support EMMA_INSTRUMENT in both full and unbundled builds.
af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea 22-Aug-2012 Ying Wang <wangying@google.com> Support EMMA_INSTRUMENT in both full and unbundled builds.

Bug: 6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
and builds emma into apk/jar as static library, instead of using emma
as part of shared library core.jar.

Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
/build/make/core/main.mk
769239f29900213044424a435c7253c1517c2a4f 17-Aug-2012 Joe Onorato <joeo@google.com> resolved conflicts for merge of 34539244 to master

Change-Id: I55b5c4aea999ff3fb5ceaabfe5d658a296f3d971
c5fbef5413fea32b0084fd197bd27f9effcb2760 17-Aug-2012 Joe Onorato <joeo@google.com> resolved conflicts for merge of fab83a3d to jb-mr1-dev

Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
0ee86a7429772df5ef075ad8dc59f0974791c94c 17-Aug-2012 Joe Onorato <joeo@google.com> Another error to warning

Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
/build/make/core/main.mk
cea08a5220bb0b1169e227dd4a08dd94fef0720b 17-Aug-2012 Joe Onorato <joeo@google.com> resolved conflicts for merge of 5836d3b3 to jb-mr1-dev

Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
8d0847e9246ab7728f9ef6e2e493f0025ac06f5b 12-Jul-2012 Joe Onorato <joeo@google.com> build system changes for jb-aah-dev merge

Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
/build/make/core/main.mk
e213944da4d6b699fea290ce84083dcd457c37ad 23-May-2012 Joe Onorato <joeo@google.com> Fail when a non-vendor product references a vendor module.

Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
/build/make/core/main.mk
6a185e453d423a8192f7b694cb0c707f9ec6c94b 22-May-2012 Joe Onorato <joeo@google.com> 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
/build/make/core/main.mk
f93f5be23ec65d2893d3b221d3753eace24dc567 21-May-2012 Joe Onorato <joeo@google.com> Dump the user tagged modules.

Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
/build/make/core/main.mk
918ee311f53d4128d753cca23b2b9a5212bd94f7 19-May-2012 Joe Onorato <joeo@google.com> Don't give the user tag to host modules automatically.

Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
/build/make/core/main.mk
10649c632d7e4385909424473ad5a566177216b2 19-May-2012 Joe Onorato <joeo@google.com> Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.

Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
/build/make/core/main.mk
26ead966d72a436beddf02ef17268071cb982ce0 12-Jul-2012 Joe Onorato <joeo@google.com> build system changes for jb-aah-dev merge

Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
/build/make/core/main.mk
75493610b33323ccc958e2ff45e9eafb9750fa5d 23-May-2012 Joe Onorato <joeo@google.com> Fail when a non-vendor product references a vendor module.

Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
/build/make/core/main.mk
529302d912e9ad6d62b56f98ffb718e5a4b23b18 22-May-2012 Joe Onorato <joeo@google.com> 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
/build/make/core/main.mk
d23c3235fa183b8c4c78551c5947158d2db8d01f 21-May-2012 Joe Onorato <joeo@google.com> Dump the user tagged modules.

Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
/build/make/core/main.mk
f85cb7c936db4b7a6b39b1163591a61e166d9e11 19-May-2012 Joe Onorato <joeo@google.com> Don't give the user tag to host modules automatically.

Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
/build/make/core/main.mk
d6b1d628be13202550cd7381fccc4e641190c0b8 19-May-2012 Joe Onorato <joeo@google.com> Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.

Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
/build/make/core/main.mk
bc415dd5eb2a135cbc24c21760338e6294c7a0d3 15-Aug-2012 Ying Wang <wangying@google.com> Support to build emmap_mata.zip in unbundled builds.

Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
/build/make/core/main.mk
da19eafc42e93bcd4aa97bd01c2ea93e967f78bf 15-Aug-2012 Ying Wang <wangying@google.com> Support to build emmap_mata.zip in unbundled builds.

Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
/build/make/core/main.mk
7023f6179d09663b794cd113c5c57426a977a248 26-Jul-2012 Ying Wang <wangying@google.com> 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
/build/make/core/main.mk
7d8c535c1f63a97a9b77fa0b5d530778640a241c 26-Jul-2012 Ying Wang <wangying@google.com> 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
/build/make/core/main.mk
2dd9902cf965f7662eff9e84c5c8d47c3f7536af 26-Jul-2012 Joe Onorato <joeo@google.com> am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
42f0127a068ecb540dc98dea23932e074d127b20 26-Jul-2012 Joe Onorato <joeo@google.com> am e3adc7fd: am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."

* commit 'e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
e35a445f2f7b32e39d88e0ba58b120aae6807baf 26-Jul-2012 Joe Onorato <joeo@google.com> Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb

Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
/build/make/core/main.mk
74e883d1415f68dc52a7e679cd1ea1f486b8d8bb 25-Jul-2012 Joe Onorato <joeo@google.com> Don't try to build the emulator on Mac OS if the right tools aren't installed.

Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
/build/make/core/main.mk
594165c17b1a60bac3e428fdff882ea61d12db14 03-Jul-2012 Ying Wang <wangying@android.com> am 9ffe27e0: am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."

* commit '9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
This property is set when HAVE_SELINUX:=true during build.
9ffe27e013c84e036d5e38b02edf3ca12f7405a8 03-Jul-2012 Ying Wang <wangying@android.com> 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.
9d8a51f537cc1191655e0d8edc7eaffde2503ac7 03-Jul-2012 William Roberts <bill.c.roberts@gmail.com> 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
/build/make/core/main.mk
dfb581802726a6eecd151730e379aeebf4defc33 30-Jun-2012 Ying Wang <wangying@google.com> am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

* commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
d512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259 30-Jun-2012 Ying Wang <wangying@google.com> 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
478ba5e3f00bb1321cd022d744020231f2449287 29-Jun-2012 Ying Wang <wangying@google.com> 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
/build/make/core/main.mk
0d570a71630d70a80e838f068d413f1c1a5f55af 19-Jun-2012 Ying Wang <wangying@google.com> lint support.

Bug: 6167394
$make lint-<app-name> # to lint on a single module
$make lintall # to lint on all packages in the source
tree.

Change-Id: I4decc76fb75793ce44809232b0ec72b766fbb434
/build/make/core/main.mk
1a2c28368c47e8e38a85c04756de850a24736355 08-Jun-2012 Keun young Park <keunyoung@google.com> am fe8cddea: am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK

* commit 'fe8cddea28bc5a5266ede2bd10b482dbe840c0bf':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd 07-Jun-2012 Keun young Park <keunyoung@google.com> add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK

- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
/build/make/core/main.mk
d5ba4064c3cccdd453cd10bbef2d25ec5c286a62 06-Jun-2012 Ying Wang <wangying@google.com> am f521a8e8: am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev

* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
Clean common intermediate files if overlay changed
049f4055a8bb497a2d9b72361658e5aa331eecd9 06-Jun-2012 Joe Onorato <joeo@google.com> am d7d0afca: Add the ability in a product spec file to have modules installed for specific variants.

* commit 'd7d0afcaea24b0fb0cb37dca921a5ff52fd2485b':
Add the ability in a product spec file to have modules installed for specific variants.
d7d0afcaea24b0fb0cb37dca921a5ff52fd2485b 06-Jun-2012 Joe Onorato <joeo@google.com> Add the ability in a product spec file to have modules installed for specific variants.

Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
/build/make/core/main.mk
71004f81351511b4873cdb09d52b7624158a4840 25-May-2012 Ying Wang <wangying@google.com> Clean common intermediate files if overlay changed

This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.

This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.

Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
/build/make/core/main.mk
13054c365361669cf754c13bc9806f924245746f 23-May-2012 Ying Wang <wangying@google.com> am ce21b820: am 9ccacd7a: Set PWD to the absolute path of the top tree.

* commit 'ce21b8204d5713fd0d511cc3635719dd4ca0bf75':
Set PWD to the absolute path of the top tree.
9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29 23-May-2012 Ying Wang <wangying@google.com> Set PWD to the absolute path of the top tree.

Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.

Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
/build/make/core/main.mk
b30517897fc1208e93b6a3140dc7dba68c105a51 18-May-2012 Joe Onorato <joeo@google.com> Merge commit '54973dbc' into work

Conflicts:
core/product.mk

Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
e1d191ee956674147ac1b34129d1f2df322fc3ae 17-May-2012 Joe Onorato <joeo@google.com> Add rules to build the factory bundle.

Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
/build/make/core/main.mk
000e89a5b95a1d3071277ff279263204f49cbd78 01-May-2012 Ying Wang <wangying@google.com> Strengthen dependencies on LOCAL_REQUIRED_MODULES

Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
/build/make/core/main.mk
3024d2394f1d1f51abeb45467094ec0bf82aeb0b 01-May-2012 Ying Wang <wangying@google.com> Strengthen dependencies on LOCAL_REQUIRED_MODULES

Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: Idbd504fd415b488c397e67ab487a22bff4fa188e
/build/make/core/main.mk
5d4bcb490e4261ab56d188cc5ac490af9cc4c826 19-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Use an https URL

Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
/build/make/core/main.mk
82b836fda6894ebfccccfbddc2ce3ee2718d862e 31-Mar-2012 Ying Wang <wangying@google.com> Support to build pdk and pdk fusion.

Bug: 6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
/build/make/core/main.mk
971c246cb543b0021f78d52333bcbbe00ca106d8 29-Mar-2012 Colin Cross <ccross@android.com> Remove some dist targets from PDK builds

Remove apps.zip and package_stats.txt from the PDK build, they
fail because no apps or jar files are built.

Remove emulator.zip, the emulator is not built.

Also, put recovery.img back into the PDK build, it is needed by
the img.zip target, and will be necessary for fusion builds.

Change-Id: Ie314e0432881d3ee4f1ef3eec5a98be6b8581572
/build/make/core/main.mk
8f4c3116b2480b89c37e7a0ca6d87681a09fd340 27-Mar-2012 Dima Zavin <dima@android.com> telephony: remove default apns_conf.xml

Remove the hack from main.mk to filter through installed files
to look for an apns file.

Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
/build/make/core/main.mk
4c456990150dca67ce39b398445d7cfec1f10f3d 27-Mar-2012 Raphael Moll <ralf@android.com> Allow make 3.82 to be used under Cygwin 1.7

(Manual merge of 76bf62d75e7d4680dac1522534c56f4b511e5cd1)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
/build/make/core/main.mk
7a5960555b229cca5a7d074ea9e139ebd5a6600f 24-Mar-2012 Brian Swetland <swetland@google.com> Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK

BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.

Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
/build/make/core/main.mk
59c2136e1be13d73746da906cbb7f8f1c046e879 16-Mar-2012 Keun young Park <keunyoung@google.com> Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel"
9ec15ec89c725d51ee1fb08d4aa7e358617c8e44 15-Mar-2012 Keun young Park <keunyoung@google.com> rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel

Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
/build/make/core/main.mk
160b670f4acfbcf85eb6baf1df156ada835a6a3e 14-Mar-2012 Ying Wang <wangying@google.com> Add build goal "tests".

Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.

Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
/build/make/core/main.mk
519316e5685e4ef9360f15045cb7243939fecc27 12-Mar-2012 Keun young Park <keunyoung@google.com> Fix build caused by 168380

Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
/build/make/core/main.mk
7fc7aad152ae595de371a5b969744ff3b971d81c 28-Feb-2012 Keun young Park <keunyoung@google.com> changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug: 6079146

Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
/build/make/core/main.mk
c04b56c5b05ef7e2fdc6b24e9428bfb2a3c45a19 27-Jan-2012 Raphael Moll <raphael@google.com> Merge "Move Windows SDK whitelist out of main.mk"

This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

(cherry-pick of 347f3051814d7d36a9a6af387e724bb327b53ecd)

Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
/build/make/core/main.mk
b7fc1545f371a46aea6588280449e31c2348d809 07-Feb-2012 Colin Cross <ccross@android.com> Add gcc_demangle to BUILD_TINY_ANDROID projects

libgccdemangle.so is required to build libcorkscrew, which is in
system/core and built when BUILD_TINY_ANDROID is set.

Change-Id: Ide9af58cfc075e27a7368993b29be2c0e53275a8
/build/make/core/main.mk
347f3051814d7d36a9a6af387e724bb327b53ecd 27-Jan-2012 Raphael Moll <raphael@google.com> Move Windows SDK whitelist out of main.mk

This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
/build/make/core/main.mk
4b5e4ba5fd2490c19c370b6e1fe7337c8e476b89 12-Jan-2012 Xavier Ducrohet <xav@android.com> Remove mention of layoutopt/uix as they are gone.
/build/make/core/main.mk
d38c870d2e168b051692b20ade0fc966c9e2daf7 22-Dec-2011 Conley Owens <cco3@android.com> Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
/build/make/core/main.mk
d7a1a9b49b9d6e8331bcc5b2ece84903a94553de 22-Dec-2011 Conley Owens <cco3@android.com> Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
/build/make/core/main.mk
fe927e18a698b62b48ce4f662a1170de5b1295ac 22-Dec-2011 Raphael <raphael@google.com> Merge "Allow make 3.82 to be used under Cygwin 1.7"
d44d54a0d947de3bda7132ed9216b9685ace92dd 22-Dec-2011 Raphael <raphael@google.com> Merge "Add 2 SDK directories that can build under Cygwin/Mingw"
76bf62d75e7d4680dac1522534c56f4b511e5cd1 19-Dec-2011 Raphael <raphael@google.com> Allow make 3.82 to be used under Cygwin 1.7

OTOH, should we just allow the expression to be >= 3.81
for all platforms? For cygwin it's a specific case since
we don't build the platform, only a handful set of tools
and it works just fine with a newer make 3.82.

Change-Id: Icff0d0e13bce79f7164007985f14db56e9049552
/build/make/core/main.mk
0ae6d2956858ed3a9c0b65fecd70bc783976173c 19-Dec-2011 Raphael <raphael@google.com> Add 2 SDK directories that can build under Cygwin/Mingw

Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
/build/make/core/main.mk
cf0b20413e750c78060cb32ccc5fc1a970aa4085 19-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> am b056d71f: If setupwizard is disabled, don\'t force it to optional

* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
If setupwizard is disabled, don't force it to optional
b056d71f79b717fb36d375e48c19509900f977d3 01-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> If setupwizard is disabled, don't force it to optional

Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
/build/make/core/main.mk
89686538d77c47ed7816594c7597f5d1e456d656 16-Dec-2011 Ying Wang <wangying@google.com> Support to build factory ramdisk image.

Bug: 5769921

With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb

On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.

Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
/build/make/core/main.mk
0a099d904a5f82cba0ce86878d3d3e5e2dbf9e95 16-Dec-2011 Ying Wang <wangying@google.com> Support to build factory ramdisk image.

Bug: 5769921

With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb

On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.

Change-Id: I3778e3d091979261cb476628da1365f931e11f49
/build/make/core/main.mk
9f8e8db188371cb3787a91a03d193f87ad244ea3 04-Nov-2011 Ying Wang <wangying@google.com> Build cache.img on demand

Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
/build/make/core/main.mk
c0debb9b5e2f2f5deb00fb7db5b5c03177b06460 02-Nov-2011 Ying Wang <wangying@google.com> Revert "Build cache.img."

This reverts commit 531bdb546af5127ed9c1012871d780930eb990f5.
/build/make/core/main.mk
531bdb546af5127ed9c1012871d780930eb990f5 01-Nov-2011 Ying Wang <wangying@google.com> Build cache.img.

Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
/build/make/core/main.mk
2d50524a0164072d0cf3f60108d0a2227d4cabc1 01-Sep-2011 Mike Lockwood <lockwood@android.com> main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: I9e1523833e1567a59b19482c7834fe30479a009f
Signed-off-by: Mike Lockwood <lockwood@android.com>
/build/make/core/main.mk
3282e9bb4d26e56f4ed37b55b7771db02374d4c8 27-Oct-2011 Xavier Ducrohet <xav@android.com> Remove references to layoutopt from the build.

Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
/build/make/core/main.mk
65216a2d3bdf3e6f07010a8ebfccf17017e96db9 27-Oct-2011 Omari Stephens <xsdg@android.com> Revert "Remove layoutopt; replaced by the more generic "lint" tool."

This reverts commit 7a23d45cdca22751c421427ce0e4e12df31945d2.
/build/make/core/main.mk
7a23d45cdca22751c421427ce0e4e12df31945d2 21-Oct-2011 Tor Norbye <tnorbye@google.com> Remove layoutopt; replaced by the more generic "lint" tool.

Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
/build/make/core/main.mk
4377cc701a0bef32aaff34d0d119974544fd20d6 21-Oct-2011 Tor Norbye <tnorbye@google.com> Build fix - include sdk/lint in build

Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
/build/make/core/main.mk
486be821985f5c6680daee90bdf3befb602a1ed0 08-Oct-2011 Ying Wang <wangying@google.com> Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds

Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
/build/make/core/main.mk
c36df7b12bb5e1e97e39c3576d330af37536b02d 16-Sep-2011 Raphael <raphael@google.com> Enable building sdk/avdlauncher in the Win SDK.

Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
/build/make/core/main.mk
15185063456dcbd6975c89bf9bbb7d9ff81f0f28 02-Sep-2011 Raphael <raphael@google.com> Enable 'make traceview' under Windows.

Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
/build/make/core/main.mk
9d99d7dfb88f63d0cebef00ca426a834aad44048 26-Aug-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 6da54b6e to master

Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
6da54b6e0e0b9daba92562fbf4434887dc1e3528 25-Aug-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp

Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
d7d096df71c65cbcd35def83bdb4f7cc86c3f290 08-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Tighten the toolchain version check

Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
/build/make/core/main.mk
43dd89d2a0c166525db0af4162b9b08aaa186aed 23-Aug-2011 David 'Digit' Turner <digit@android.com> emulator: Enable GLES emulation libraries

This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
/build/make/core/main.mk
88833405c4bc45d8b25f8586aa33a713b5870db0 17-Aug-2011 Raphael Moll <ralf@android.com> am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."

* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
Add sdk/rule_api to the Windows build paths.
cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef 17-Aug-2011 Raphael Moll <ralf@android.com> am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."

* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
Add sdk/rule_api to the Windows build paths.
408c7f8a8f61deda637b884cca91e670f7d23c0a 17-Aug-2011 Raphael Moll <ralf@android.com> Add sdk/rule_api to the Windows build paths.

Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
/build/make/core/main.mk
d1975a2946c899513e0e041627be104fb536cf65 17-Aug-2011 Brian Swetland <swetland@google.com> fix tiny android builds (add mksh)

Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
/build/make/core/main.mk
b194b9d185bfb521ba7ad0a8773906e7facb3fcb 29-Jul-2011 Raphael Moll <ralf@android.com> am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
Add sdk/assetstudio to the Windows build paths.
dd9e8477e6cc1a8de556dd7942fb81c049e2e373 29-Jul-2011 Raphael Moll <ralf@android.com> am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit '266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
667ec86a33b8eff749b429fb0926a0c0b1ad1646 29-Jul-2011 Raphael Moll <ralf@android.com> Add sdk/assetstudio to the Windows build paths.

Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
/build/make/core/main.mk
40b5a67ecd70eee8583b6b12775d18255868d89f 01-Jul-2011 Mike Lockwood <lockwood@android.com> Remove obsolete persist.service.adb.enable property from default.prop

Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
/build/make/core/main.mk
0ef25320d5c5dd749769e9d0c4c803d8fc4b4e42 23-Jun-2011 David 'Digit' Turner <digit@android.com> am a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'a85ebfb059080865a549539a9d2758c4e8b8aeed':
Turn-off implicit GNU Make RC/SCCS rules
a85ebfb059080865a549539a9d2758c4e8b8aeed 23-Jun-2011 David 'Digit' Turner <digit@android.com> am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'fa112f982241fc3efa0129094e87a34f2317f41e':
Turn-off implicit GNU Make RC/SCCS rules
52d697d432e0684fb13884c94f7768c5ec8ef8ec 22-Jun-2011 David 'Digit' Turner <digit@android.com> Turn-off implicit GNU Make RC/SCCS rules

This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.

Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
/build/make/core/main.mk
2914f7f3b3b4152fee6b6ab012e58e8166e3d7a2 25-May-2011 Ying Wang <wangying@android.com> Relax the constraint of 64bit build environment.

Change-Id: Id349f424b122816f42c99769b629a9447986cf20
/build/make/core/main.mk
70776231ee8a972e2c22b08908c10ebaad9a4841 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 45a3ad7d: Merge c1efb060

* commit '45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
45a3ad7d225495367a47440da118609b4940fe71 07-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge c1efb060

Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
c1efb06045132bc620e71be120a0ca71d81b35d5 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 3c60c67a: Merge from open-source gingerbread

* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
f7ad63ae65f75e5aa0d0a8234feddacdace95df0 31-May-2011 Dan Bornstein <danfuzz@android.com> Clean up how dex preoptimization gets configured.

Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
/build/make/core/main.mk
053dccb159e2f73aa763bfdc4578586fba57f841 25-May-2011 Ying Wang <wangying@android.com> Relax the constraint of 64bit build environment.

Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
/build/make/core/main.mk
e480e7fd89b2c9813873be5a9ebd74a3dabe9e18 16-Apr-2011 Raphael Moll <ralf@android.com> am 009e6022: am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit '009e602275e39fccbd6de52534621f6ceeaae001':
Allow swtmenubar module to be buildable on Windows.
009e602275e39fccbd6de52534621f6ceeaae001 16-Apr-2011 Raphael Moll <ralf@android.com> am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
Allow swtmenubar module to be buildable on Windows.
cb6a22f591d66443c923ad917f6d40e943b476ce 15-Apr-2011 Raphael Moll <ralf@android.com> am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
Allow swtmenubar module to be buildable on Windows.
59ad18fa49d930905b8aab382671a369504554f6 15-Apr-2011 Raphael Moll <ralf@android.com> Allow swtmenubar module to be buildable on Windows.

Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
/build/make/core/main.mk
c3dd0e62c05d4e27276ea25a73436799b21255c0 13-Apr-2011 Ying Wang <wangying@google.com> am bdbcc65d: am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.

* commit 'bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540':
Drop using vendor/google/etc/apns-conf.xml for eng builds.
bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540 13-Apr-2011 Ying Wang <wangying@google.com> am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.

* commit '7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
Drop using vendor/google/etc/apns-conf.xml for eng builds.
7c1a1247f3e7110a95696671e8f71334e9b3c1b5 22-Mar-2011 Ying Wang <wangying@google.com> Drop using vendor/google/etc/apns-conf.xml for eng builds.

Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
/build/make/core/main.mk
fdc3192e6853ed92ec44653a609d386088bbb6d9 01-Apr-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp

Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
bd0c91c8b9d36fd3ed8d8ac7e66b3e1eee3bb0bb 16-Feb-2011 Raphael <raphael@google.com> Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
/build/make/core/main.mk
21a8b2459f60d71ccf70f2411b63673c0e4c5757 16-Feb-2011 Raphael <raphael@google.com> Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
/build/make/core/main.mk
b375e71d306f2fd356b9b356b636e568c4581fa1 09-Mar-2011 Iliyan Malchev <malchev@google.com> build: remove prelinker build build system

This patch removes support for prelinking from the build system. By now, the
prelinker has outlived its usefulness for several reasons. Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote. Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either. Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization. Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree. It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op. Individual Android.mk will get cleaned
separately. Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
/build/make/core/main.mk
f8a7ff191af760ee01e5c31f154f0dbc7abfef7e 10-Mar-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
123995f9e1c4318b6b7469754a9d19e5c66b34c5 10-Mar-2011 Ying Wang <wangying@google.com> am be188caf: Dist build.prop in sdk builds.

* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
Dist build.prop in sdk builds.
be188cafd21c7356cc33ae042661b682d0536e8b 08-Mar-2011 Ying Wang <wangying@google.com> Dist build.prop in sdk builds.

Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
/build/make/core/main.mk
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e 16-Feb-2011 Raphael <raphael@google.com> Build SDK repository

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
/build/make/core/main.mk
16166e5727cb30a4a3f2f02b23c3cee2fbd4aa36 04-Feb-2011 Raphael Moll <ralf@android.com> am 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
SDK: Enable "make sdk/common" under Windows
5c6069d632b3019c74de57b5d89a4e90d2b59759 03-Feb-2011 Raphael Moll <ralf@android.com> am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
SDK: Enable "make sdk/common" under Windows
ed19189877a3a380074e8e76969ef23689cec8fd 03-Feb-2011 Raphael Moll <ralf@android.com> am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
192d1ef6d73c50db358bb7c8be6c29e6cc7540a2 03-Feb-2011 Raphael Moll <ralf@android.com> SDK: Enable "make sdk/common" under Windows

Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
/build/make/core/main.mk
678c7ac997ba5daf09664d3e9b26f1c4a493b99e 03-Feb-2011 Brian Swetland <swetland@google.com> am d7798a7e: fix TINY ANDROID yet again...

* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
d7798a7e1b3241c49d7c8325cf14ac608350b719 03-Feb-2011 Brian Swetland <swetland@google.com> fix TINY ANDROID yet again...

Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
/build/make/core/main.mk
0864d010018feff8a672790dde86a7c2a3613813 02-Feb-2011 Ying Wang <wangying@google.com> am 9bc858c4: am 9c0f3e35: Build only userdata.img.

* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
Build only userdata.img.
9c0f3e355194d1c43bf70f35f953d6a2babc815a 01-Feb-2011 Ying Wang <wangying@google.com> Build only userdata.img.

Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user

Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
/build/make/core/main.mk
3d85bbd288cac078ae8938b8be5d243f77535a30 24-Jan-2011 Ying Wang <wangying@google.com> Merge "Add modifier goal incrementaljavac"
7cc24409946e0d2f6a3d44ab44e9d2d192e945ef 24-Jan-2011 Brian Swetland <swetland@google.com> make TINY_ANDROID build without the presence of frameworks/* and development/*

Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
/build/make/core/main.mk
72bf09d33313c2b9a191b549dcb5e717bff9a600 24-Jan-2011 Brian Swetland <swetland@google.com> tiny android: include su

Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
/build/make/core/main.mk
015edd2c1b4a4300ccccee4036ec2ca7e9ad798a 21-Jan-2011 Ying Wang <wangying@google.com> Add modifier goal incrementaljavac

With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
/build/make/core/main.mk
a7600364feb0eff313374e9dd0502ea7e15085f6 21-Jan-2011 Brian Swetland <swetland@google.com> fix tiny android build

Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
/build/make/core/main.mk
d3e6fcbe6cfc531719429b7fec844565aa8089e7 12-Jan-2011 Raphael <raphael@google.com> Add llvm-rs-cc to the tools buildable under Windows.

To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.

Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
$ USE_MINGW=1 make llvm-rs-cc

Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
/build/make/core/main.mk
228fcef025cf827428a812a182bce0e9b7ee2b0b 09-Dec-2010 Ying Wang <wangying@google.com> Change phony target name dist_libraries to dist_files.

Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.

Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
/build/make/core/main.mk
493ab6449c6443760d69707fdbe574254c71e85c 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am ce5d7e04: am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"

* commit 'ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"

* commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
6ba4ebf272eccf5f98490a59d1381dde37ec1109 08-Nov-2010 Magnus Bäck <magnus.back@sonyericsson.com> Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'

Commit e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious

make: *** No rule to make target `all'. Stop.

error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.

Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
/build/make/core/main.mk
885b6b99d34fa5e6c22b4c17d3e5c78e9f74afc4 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> Correct makefile test for stagefright build

Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
/build/make/core/main.mk
cc6c8cb856b408c9ac814d44ececcd1891c930f8 19-Nov-2010 Ying Wang <wangying@google.com> am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"

* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
92cc4c07475bd77ffb058f430c27b04f8cc9dfef 19-Nov-2010 Ying Wang <wangying@google.com> am b26a65b5: Merge "Restrict make version to 3.81"

* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
824d7b2f02f99f1661912203d530909fc242a741 18-Nov-2010 Kenny Root <kroot@google.com> Fix typo in ALL_PREBUILT error message

Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
/build/make/core/main.mk
4f9269ef7519354b3459ef510819ca5eec538b65 18-Nov-2010 Ying Wang <wangying@google.com> Restrict make version to 3.81

Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.

Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
/build/make/core/main.mk
8d458ab320274cbd77e2e4bc6b994d1b1d3148c2 12-Nov-2010 Xavier Ducrohet <xav@android.com> am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common"

* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
f5f81fc75e6f4ab598fab8876efc892243287def 11-Nov-2010 Xavier Ducrohet <xav@android.com> am 01a9840b: Merge "Rename layoutlib_utils into ide_common"

* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
2e5ee27e9ed94babf291c507fee5aa2b00826e29 11-Nov-2010 Xavier Ducrohet <xav@android.com> Rename layoutlib_utils into ide_common

Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
/build/make/core/main.mk
9566122c9d6b0c4844563f3af9185adf082c6155 28-Oct-2010 Daniel Sandler <dsandler@google.com> make help: prints a handy list of useful targets

A small step to making the platform build environment more
self-documenting.

Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
/build/make/core/main.mk
7522f04a4b0327cf493dfe6c501634b2b1e1367a 12-Oct-2010 Ying Wang <wangying@google.com> Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.

Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
/build/make/core/main.mk
64cf5aa66769287147a6d0d54a85460d3727eedd 08-Oct-2010 Joe Onorato <joeo@google.com> Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"

This reverts commit 95e743a6c02c9f9844cab95635b4954ecd82e7ff.
/build/make/core/main.mk
95e743a6c02c9f9844cab95635b4954ecd82e7ff 08-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Enforce that PRODUCT_ variables aren't modified by module makefiles

This eliminates one of the way a module could insert itself into
a build without going through a product definition file.

Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
/build/make/core/main.mk
531f524256c049fb3763b5c82808f315ea83d3bb 28-Sep-2010 Dima Zavin <dima@android.com> core: Make fake packages have real installed files for proper dependencies

Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
/build/make/core/main.mk
e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e 27-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of dc45f86a to master

Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
dc45f86af8d5c2cdc743bee8878fe005cf8222d8 27-Sep-2010 Ying Wang <wangying@google.com> am 02352378: Remove emulator-based dexpreopt logic from the build system.

Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.
0235237805991b48831dc8add072a50c478b2fcb 27-Sep-2010 Ying Wang <wangying@google.com> Remove emulator-based dexpreopt logic from the build system.

Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
/build/make/core/main.mk
49ce545ad5cf9928b68758c14e69de0e0062e9ec 26-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Disable this check that was submitted by mistake.

There's still one device that doesn't build with this check enabled.

Change-Id: I962afe9c739df15e77ead30311c34be411674f53
/build/make/core/main.mk
c2901aa5134a11d6594af573f98ab6b08c793f71 24-Sep-2010 Dima Zavin <dima@android.com> core: don't add file deps for modules without any installed files

Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
/build/make/core/main.mk
0944771fb0de7510046e252b59f4afa7d24b212f 26-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Issue an error when unknown files are added to ALL_PREBUILT

Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
/build/make/core/main.mk
3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3 23-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 9f28f0d7 to master

Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
9f28f0d76e31c9cce0aecb06091cf0e40b44fd0e 23-Sep-2010 Ying Wang <wangying@google.com> am e7874c43: Integrate dexpreopt into the build system.

Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
e7874c430895b9a4e631c89f1e7729da9264d167 18-Sep-2010 Ying Wang <wangying@google.com> Integrate dexpreopt into the build system.

Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
/build/make/core/main.mk
1613f4ff1ee432a01fcce70a9020f19929e7290a 22-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
fed45d859aaecd8b34fb65eeaad678e1a1c71aa9 22-Sep-2010 Jesse Wilson <jessewilson@google.com> am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.

Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
554402f76d8720dc3784b133d95f4aba2da4aa91 22-Sep-2010 Ying Wang <wangying@google.com> am 38a3161d: String literal change.

Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
38a3161dc7f5fec81df9412bc202c3962c74535d 22-Sep-2010 Ying Wang <wangying@google.com> String literal change.

Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
/build/make/core/main.mk
77070aa757806d1617d707db4d2bd7931b2353fc 22-Sep-2010 Jesse Wilson <jessewilson@google.com> am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.

Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp

* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
ce7d5023c3df4c16ae395d64d51dd8345e40a39e 22-Sep-2010 Jesse Wilson <jessewilson@google.com> Turn dalvikvm host builds on by default when linux is the host OS.

Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
/build/make/core/main.mk
b368bba41c4fb9b5c76a56cb1bd850517ef9df53 08-Jul-2010 Ying Wang <wangying@google.com> Enforce 64-bit build environment

We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
/build/make/core/main.mk
0153446b798f2ead1b6a9a9a704374fbbcc66ba0 16-Sep-2010 Ying Wang <wangying@google.com> am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread

Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
6674ec30bb92337e3bccb67bca53555a798a493f 15-Sep-2010 Ying Wang <wangying@google.com> am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread

Merge commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp

* commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
db2cb63612af2bc9e8bd7ea6d33da2218a33de2d 15-Sep-2010 Ying Wang <wangying@google.com> Change "make PRODUCT-XXX-tests" to build only tests-build-target

Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
/build/make/core/main.mk
8dc8faaaeadf83353b8144cc0db58972f19f5c7e 14-Sep-2010 Joe Onorato <joeo@google.com> Add option to fail when Android.mk files change PRODUCT_* variables.

It's turned off for now.

Change-Id: I0b5a3ce5fdc7693c8ebd870312f0c2e13fdb8b22
/build/make/core/main.mk
29ff8c85c1760891eb371c308e6e15d83ecd790e 08-Sep-2010 Dan Bornstein <danfuzz@android.com> am 3177afa8: am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Merge commit '3177afa8177d8b31dd6bd160816a11fedeec7e07'

* commit '3177afa8177d8b31dd6bd160816a11fedeec7e07':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
3177afa8177d8b31dd6bd160816a11fedeec7e07 08-Sep-2010 Dan Bornstein <danfuzz@android.com> am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Merge commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp

* commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
f13bdd94dc4d4f261d7a4850d7f4cd34b88e2cab 08-Sep-2010 Dan Bornstein <danfuzz@android.com> Enable WITH_HOST_DALVIK for "user" builds on Linux.

Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
/build/make/core/main.mk
f06675e2a47d0e9322f8a619e84f72882cec039d 03-Sep-2010 Joe Onorato <joeo@google.com> am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
The old clean target had bit rotted.
4b1e2245857d696aa0dfcd7a163c6d04025c74f6 03-Sep-2010 Joe Onorato <joeo@google.com> am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp

* commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644':
The old clean target had bit rotted.
dfc5e0cb7b32c172cc6f88c890c1e6e6ef1ff2fe 03-Sep-2010 Joe Onorato <joeo@google.com> The old clean target had bit rotted.

Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
/build/make/core/main.mk
3e8f9878895d9c7b0978e9f26bc069ce9b0bdc7b 30-Aug-2010 Andreas Huber <andih@google.com> am aeb2bbc1: am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.

Merge commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'

* commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486 30-Aug-2010 Andreas Huber <andih@google.com> am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.

Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp

* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
200f25984ccc8a9e5fc13bfbcde22c17bc80d410 30-Aug-2010 Andreas Huber <andih@google.com> Build without OpenCore by default, remove obsolete opt-in to stagefright.

Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
/build/make/core/main.mk
f3e7e04f70f10025f43cb9f0380b02eb6b7f07b3 29-Aug-2010 Raphael Moll <ralf@android.com> am 2a1873b0: am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.

Merge commit '2a1873b09c73700d4339f379f4389b26beb81173'

* commit '2a1873b09c73700d4339f379f4389b26beb81173':
SDK: add hierarchyviewer2 to windows target list.
2a1873b09c73700d4339f379f4389b26beb81173 29-Aug-2010 Raphael Moll <ralf@android.com> am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.

Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp

* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
6ba4b59c9067b747ab2a4c85621e656c4d4614e3 29-Aug-2010 Raphael Moll <ralf@android.com> SDK: add hierarchyviewer2 to windows target list.

Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
/build/make/core/main.mk
b139a445d6813843b934b0ec7dd0495fe11ea77d 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 5f0df7a9: Manual merge

Merge commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1'

* commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1':
Add new variable TARGET_SHELL := ash (default; or mksh)
5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge

Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
2213aab8b9043d939752baa61910f970338a1e6b 03-Jun-2010 Thorsten Glaser <tg@mirbsd.org> Add new variable TARGET_SHELL := ash (default; or mksh)

Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual

Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
/build/make/core/main.mk
839c058dd062be0771ec656ee85b1128638b161d 17-Aug-2010 Raphael Moll <ralf@android.com> am ddf08caa: am ddeb150d: Add easymock for list of Windows SDK targets.

Merge commit 'ddf08caafa9644a502c0804450b9b6572010eb0d'

* commit 'ddf08caafa9644a502c0804450b9b6572010eb0d':
Add easymock for list of Windows SDK targets.
ddf08caafa9644a502c0804450b9b6572010eb0d 17-Aug-2010 Raphael Moll <ralf@android.com> am ddeb150d: Add easymock for list of Windows SDK targets.

Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp

* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
Add easymock for list of Windows SDK targets.
ddeb150d8d300806de576430444bf1a84ff35e96 16-Aug-2010 Raphael Moll <ralf@android.com> Add easymock for list of Windows SDK targets.

Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
/build/make/core/main.mk
84a5ba03b469a28f3678eb58ecd9aada5b416493 22-Jul-2010 Ying Wang <wangying@google.com> am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'

* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
b96e8a8cc629c3e3a196263cc548bd55824e4ade 22-Jul-2010 Ying Wang <wangying@google.com> am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
d9dea715e5841028b1a30aa3f357b05c9de3e8c7 22-Jul-2010 Ying Wang <wangying@google.com> am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
0188414bc634798fa429be627cdb697daee68966 21-Jul-2010 Ying Wang <wangying@google.com> add phony target "all_modules" and use it as make goal for "mm"/"mmm"

So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
/build/make/core/main.mk
ad8aec94faa3c08b990110bbe12484eadc897839 14-Jul-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 6c56dd64 to master

Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
6c56dd64b25eaba741b41888e98ea31bd34202b2 14-Jul-2010 Ying Wang <wangying@google.com> am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread

Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
Add phony target dist_libraries
a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13 14-Jul-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
c608c44c1f9771a8705131e48f3ee83a3185717d 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 703f4958: merge from open-source master

Merge commit '703f4958c207c575adfa1526725728b96c575649'

* commit '703f4958c207c575adfa1526725728b96c575649':
update 404'd source.android.com URLs
703f4958c207c575adfa1526725728b96c575649 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
8137a0b6590f0749bfc26b07ca2c4633a3a5d43a 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am d7fcea20: merge from open-source master

Merge commit 'd7fcea201db376e285aab74cefae29d2ac2b33df'

* commit 'd7fcea201db376e285aab74cefae29d2ac2b33df':
Create boottarball just like systemtarball
d7fcea201db376e285aab74cefae29d2ac2b33df 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
56997a98c3da80c520d43978d9082233eb164064 09-Jul-2010 Ying Wang <wangying@google.com> am 1599ddd0: am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread

Merge commit '1599ddd08529465aef8f205bd6fce28f16d2ec37'

* commit '1599ddd08529465aef8f205bd6fce28f16d2ec37':
Enforce 64-bit build environment
1599ddd08529465aef8f205bd6fce28f16d2ec37 09-Jul-2010 Ying Wang <wangying@google.com> am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread

Merge commit '0d205521ae4e8907bcc80774260a68c923970eca' into gingerbread-plus-aosp

* commit '0d205521ae4e8907bcc80774260a68c923970eca':
Enforce 64-bit build environment
68f9303c90253f5149e4bfe323f9ee77fdf4b380 26-Jun-2010 Chris Peterson <cpeterso@cpeterso.com> update 404'd source.android.com URLs

Change-Id: If305c7f6f3ac3624568de258bdc13b142ad32cf9
/build/make/core/main.mk
52aac20307073b8149a31d01b0b295651ea4b042 05-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Create boottarball just like systemtarball

Change-Id: I97640bc973ab1d115499878a63bff48f80b326ec
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
/build/make/core/main.mk
d2e830b9b408b95df46f628f33ced3dcbd6975d8 08-Jul-2010 Ying Wang <wangying@google.com> Enforce 64-bit build environment

We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
/build/make/core/main.mk
8d9cbe557d352a2af6750500f3feb57b13cd9742 08-Jul-2010 Ying Wang <wangying@google.com> Add phony target dist_libraries

that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
/build/make/core/main.mk
8160d9316afc9e653ab93e14a347ef6789a0ebed 02-Jul-2010 Ed Heyl <edheyl@google.com> am 7d735133: Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge b/2590492 and requested again

Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp

* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
382fd41a9b34400cc9dbda348efc9924f28223b7 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 3c37c63a: merge from open-source master

Merge commit '3c37c63a83ff178334b855747ecda4c1f24c38ca'

* commit '3c37c63a83ff178334b855747ecda4c1f24c38ca':
Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
7d735133cd6f019ce839fa824f4507f19aff2e8f 01-Jul-2010 Ed Heyl <edheyl@google.com> Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
/build/make/core/main.mk
8532aa03becfb072aa6e884d313a67bada8a5abf 01-Jul-2010 Ed Heyl <edheyl@google.com> Add ramdisk.img to the dist dir, again (was removed at some point)
b/2590492 and requested again

Change-Id: I5e4c8efddf7a202694c36231c6082089eedefa5d
/build/make/core/main.mk
3c37c63a83ff178334b855747ecda4c1f24c38ca 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
34377b9ed8d5fc5c389a9cef5dbd727dae1faf1e 01-Jul-2010 Ying Wang <wangying@google.com> am 9fd6b635: am ca88861b: am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '9fd6b635d4f631968ed7a39394918ea3cd87f459'

* commit '9fd6b635d4f631968ed7a39394918ea3cd87f459':
Don't copy apns-conf.xml for apps-only build
ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba 01-Jul-2010 Ying Wang <wangying@google.com> am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
Don't copy apns-conf.xml for apps-only build
aae60c0760de29b461933347c23ec32963c91e4d 29-Jun-2010 Raphael Moll <ralf@android.com> Fix to "make ddmlib ddmuilib" under Windows/Cygwin.

Needed by the latest change to sdk.git/eclipse/script/create_ddms*.sh

Change-Id: I6dfbb418cc8813c7cdfbc077705158424220724f
/build/make/core/main.mk
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9 01-Jul-2010 Ying Wang <wangying@google.com> Don't copy apns-conf.xml for apps-only build

http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
/build/make/core/main.mk
77dfeaed2ac068770cd29b314e7697afd7c1741c 22-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Fix javadoc for Java 6.

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6

Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
/build/make/core/main.mk
6ae5c1b512d2d5e8e7abcbb7a3548511a933e522 25-Jun-2010 Ying Wang <wangying@google.com> am b2fe30f0: am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'

* commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
default empty tapas to TARGET_BUILD_APPS "all"
665828875b25db458c0b47885850c1d7a11140df 25-Jun-2010 Ying Wang <wangying@google.com> am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
c955834ad0715343a2245142be416f92b83e8306 25-Jun-2010 Ying Wang <wangying@google.com> am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
c048c9b598b36dc7506a954cc0d3d80f308b1b13 25-Jun-2010 Ying Wang <wangying@google.com> default empty tapas to TARGET_BUILD_APPS "all"

So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
/build/make/core/main.mk
5f9168c0d56d0c20da91f06d1078a1a47f1b547a 24-Jun-2010 Andreas Huber <andih@google.com> am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread

Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'

* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
Remove now unnecessary property overrides to opt into stagefright.
e3bbae0382e887b69c8657bb793e3d492de55f49 24-Jun-2010 Andreas Huber <andih@google.com> Remove now unnecessary property overrides to opt into stagefright.

Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
/build/make/core/main.mk
ba3897fdf17452498607d53a6159f91b11381eb3 23-Jun-2010 Jeff Hamilton <jham@android.com> am 66d41149: am 4a1c70e5: Switch the required host Java environment to 1.6.

Merge commit '66d41149d94fc7153467f9e1b0af55518ba86565'

* commit '66d41149d94fc7153467f9e1b0af55518ba86565':
Switch the required host Java environment to 1.6.
4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc 22-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
/build/make/core/main.mk
878c62ae14fb88cfda9d197298e152d82f854316 21-Jun-2010 Guang Zhu <guangzhu@google.com> resolved conflicts for merge of 10b3f4b8 to master

Change-Id: I169c45161af01596c408cd3f3173d67cb541cb46
4b137047210a1e64df1ebc0807d4eeeac7052c1e 21-Jun-2010 Guang Zhu <guangzhu@google.com> restore emma changes overwrittern by I9174f843

Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
/build/make/core/main.mk
f9cd36a0f71c78e20f5ff24f9dd48af17d741cb6 16-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 56791ebe to master

Change-Id: I7463636796f1262fd92af839102dc58d562259f7
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6 16-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 2b8d2383 to gingerbread

Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
8aeb7cc4614147adaa70a9c270c68737afb4c3f7 15-Jun-2010 Joe Onorato <joeo@android.com> am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo

Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
b55b07fef7c5bff8d9f3403698f18195889737ba 12-Jun-2010 Ed Heyl <edheyl@google.com> am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'

* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
d83f33969aa2734000338e01b84957996ef1bb34 12-Jun-2010 Ed Heyl <edheyl@google.com> Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

This reverts commit 1f29d2c376295cb7ba909ae2beb4904099546e89, reversing
changes made to f9f513ab3386e0ab61cb072170b4b65f0d124732.
/build/make/core/main.mk
19b9aa3cd15ba8bd1981945ba91088c07d7648f3 11-Jun-2010 Sriram Raman <sriramkraman@google.com> am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
Switch the required host Java environment to 1.6.
da12daf15f2e6aef7e94f340d23bc435ddc025f4 10-Jun-2010 Joe Onorato <joeo@android.com> Add a tapas command.

(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps. Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
/build/make/core/main.mk
16fa4b290e8ce76652c9ba0ba16b80578456ab95 10-Jun-2010 Joe Onorato <joeo@android.com> Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.

Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
/build/make/core/main.mk
76478e8ce6283b045c3759fc868773b0e699af30 10-Jun-2010 Jeff Hamilton <jham@android.com> am f597c7be: am f9f513ab: Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken
d41c06539c2c8f39d4f434efb1f69a31773a2566 09-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

Change-Id: Ic289e35a747b6f462816aca159acba6d400829c9
/build/make/core/main.mk
e4fb7ccd9bb17f90670059992b07c908464c7952 09-Jun-2010 Jeff Hamilton <jham@android.com> Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers.

Change-Id: Ieb0779ef54cdfa921a8dbfb1041536f8969d22e4
/build/make/core/main.mk
f33c3ef9332c2d3e4a04b14819aa3dbb9f0d4d21 02-Jun-2010 Ying Wang <wangying@google.com> am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master

Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
Cherry-pick unbundled build changes from master
b93e03cbc9d47a9d9a385c780ed64639e2a23ae5 02-Jun-2010 Ying Wang <wangying@google.com> am 52911309: Cherry-pick unbundled build changes from master

Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp

* commit '529113098350c026ec521258d4c6fba51f285a48':
Cherry-pick unbundled build changes from master
529113098350c026ec521258d4c6fba51f285a48 26-May-2010 Ying Wang <wangying@google.com> Cherry-pick unbundled build changes from master

Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
/build/make/core/main.mk
00f3a02b0fb9796dc56940d48f6776289fbdf3a1 20-May-2010 Ying Wang <wangying@google.com> Improve on unbundled app build

1. build only apps specified in APP-xxx.
2. support building multiple apps in a single make: make APP-Gmail-GmailTests-xxx

Change-Id: I863d3b503a240ae43652e9b18043b60416bcc25a
/build/make/core/main.mk
ebd5a9e11f34d7980d0cb3ef07f32aa4ae8e834f 11-May-2010 Ying Wang <wangying@google.com> Dist unbundled app.

Change-Id: Ib4c01b2623ec1059b66c541cc35eae4d2d811ef3
http://b/issue?id=2667113
/build/make/core/main.mk
1a031e411ef5eca621c1958103407a6dc40a5114 11-May-2010 Ying Wang <wangying@google.com> Support for unbundled app build

With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113

Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
/build/make/core/main.mk
18b75566429107b147368f8e392f6b25f975f5ee 14-May-2010 Guang Zhu <guangzhu@google.com> Squashed commit of the following (DO NOT MERGE):

commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date: Fri Apr 23 11:54:37 2010 -0700

collect emm meta files for emma instrumented build

when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af

commit 8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date: Wed Mar 10 15:48:03 2010 -0800

enhancement for building app with emma code coverage

* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f

Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
/build/make/core/main.mk
a64dbd75becf1cbbaa96403b39c99d58ba0b75cf 18-May-2010 Joe Onorato <joeo@android.com> am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app.
77dc0a58e27fe7c3fcdb67bbee71010c59dd4344 18-May-2010 Joe Onorato <joeo@android.com> Add a rule that builds an eclipse project file for an app.

Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.

Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
/build/make/core/main.mk
07c5e16d883ad43314ff6da9b31eac05087973c0 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am da9a8535: am 216d8448: am 95f862bc: merge from open-source master
216d8448a04f3c7794d1e4ec1178a2bf6da2ba95 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 95f862bc: merge from open-source master

Merge commit '95f862bcb0418fd931c574157a5c90312ea2fb77' into kraken

* commit '95f862bcb0418fd931c574157a5c90312ea2fb77':
Fix "make modules" script bug under Mac OS X.
95f862bcb0418fd931c574157a5c90312ea2fb77 14-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
eaf130ec2c4fc643f63614bae8a94bc1fed12068 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am 58248935: am cf28b803: am ae4e1455: merge from open-source master
cf28b80398f36e5a3e67f803458e07442a2b9364 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am ae4e1455: merge from open-source master

Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken

* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
Adapt to new location of libcore
Make expr more POSIXy
generic_x86 support
Remove obsolete machine-setup.html reference.
ae4e14556bb3a789c4263ebba7ed42b3035e13f6 04-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
045d4af72d487ed3b21dfdf951ecb41ad5609a80 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
/build/make/core/main.mk
60bc203660224ffd7244a17d13e7a6f90b5cd0d0 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
/build/make/core/main.mk
aa000340af86e298eddd43aa6f0020793bee6fcb 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: Ib32222c3541b2aa66df6d6a5519049653647aae7
/build/make/core/main.mk
f38069243078629d3ebe127a06b72be911f2dd74 23-Jan-2009 Evan JIANG <firstfan@gmail.com> Fix "make modules" script bug under Mac OS X.

For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.

Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
/build/make/core/main.mk
df55739f49753fbfe5755469d4ebfe6448c501fc 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 345cbd2d: am cd0bd801: merge from open-source master
345cbd2d25a48824681377507f815948a7f76306 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am cd0bd801: merge from open-source master

Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
Fix "make layoutlib" under Windows+Cygwin
cd0bd8011bb955e8ffab9e77180ce2b23ba7e923 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
bfa25878f976173af752fa91dcc526a6e4e75080 18-Apr-2010 Raphael Moll <ralf@android.com> Remove obsolete machine-setup.html reference.

Bug 1231

Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
/build/make/core/main.mk
a37a2cb23159709260f248b46428987c9aeb2998 28-Apr-2010 Ying Wang <wangying@google.com> Dist only if the goal is to be built

Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
/build/make/core/main.mk
ee7971132250c735b5cf11ae10d1961dc81d724a 26-Apr-2010 Ying Wang <wangying@google.com> Add ramdisk to dist. [DO NOT MERGE]

cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
/build/make/core/main.mk
0198d6ebb457d11797deb414c51b8897c67f7f10 23-Apr-2010 Guang Zhu <guangzhu@google.com> collect emm meta files for emma instrumented build

when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
/build/make/core/main.mk
8b9b39e995407a025ed9bc87b5062194f1b5f51f 26-Feb-2010 Ying Wang <wangying@google.com> Add phony target to build and dist sample code.

See http://b/issue?id=2468418
After this CL, add "samplecode" to your make goals, you will get the sample apks
built and installed at out/target/common/samples/.

Change-Id: Iff83f2ba6b6c2fe6ac1c78ca4a9d4bc6953dac8a
/build/make/core/main.mk
929cdf3313e50df136f483f92205ab74ae77e8b5 20-Apr-2010 Ying Wang <wangying@google.com> Add ramdisk.img to the dist dir.

Change-Id: Ia74c501298010734dd1b8db8df86720d3e8bb7cd
http://b/issue?id=2590492
/build/make/core/main.mk
9ca1628e3f565607e1fdef71b570d3ddb5ec09df 17-Apr-2010 Raphael <raphael@google.com> Support building Windows SDK under Linux.

- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
/build/make/core/main.mk
3d224a0fc9ed34ac4c3c79c479d5c6dc5c31b87c 17-Apr-2010 Raphael <raphael@google.com> Support building Windows SDK under Linux.

- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
/build/make/core/main.mk
135677a71800c27d7747b5c86712d05a74392f62 17-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> For userdebug builds, enable Dalvik lock contention sampling.

Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
/build/make/core/main.mk
7058f499e9a74151f6ea137697cd5b2101182782 13-Apr-2010 Raphael Moll <ralf@android.com> Fix "make layoutlib" under Windows+Cygwin

Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
/build/make/core/main.mk
139e33243bbe92858f39919c220a4d65fe8790bd 01-Apr-2010 Ying Wang <wangying@google.com> Add symbols.zip and build.prop to sdk dist.

Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
/build/make/core/main.mk
6714dbc236bf5dccba6778aa83223ee8555a6157 31-Mar-2010 Ying Wang <wangying@google.com> Add comments for ANDROID_BUILD_SHELL

Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
/build/make/core/main.mk
2ce495a0a7986fcd458954f1cae8cd1b030091d0 30-Mar-2010 Ying Wang <wangying@google.com> Allow use of alternative to bash as the build shell.

Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
/build/make/core/main.mk
9a6a1e33b3010e8ba1a47c95b691dfa09e73ffa3 18-Mar-2010 Ying Wang <wangying@google.com> Add android-info.txt to the dist dir.

Change-Id: I735655205085b0baf490b0dd011eb59cb6d4c45b
http://b/issue?id=2524072
/build/make/core/main.mk
b464b5e82ee76427634492614dcb64a6917eb33d 24-Feb-2010 Xavier Ducrohet <xav@android.com> The builders project is gone. Remove it from main.mk

Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
/build/make/core/main.mk
5dc8a659174abf68df351049679b38e32a162c5c 17-Feb-2010 Fred Quintana <fredq@google.com> remove obsolete property ro.config.sync
/build/make/core/main.mk
719a123a587da473fde4907c1bcda29e20e23dfe 17-Feb-2010 Raphael <raphael@google.com> Allow sdk/builders to be built using Windows SDK.

Change-Id: Ic3c8bc2bace166442bf780b625e5d528fea4df9f
/build/make/core/main.mk
5993b091940dc2e50ccc31b603bed6608b723f27 28-Jan-2010 Raphael <raphael@google.com> am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
Fix windows make: layoutlib_api moved to sdk.git too.
e749b5a71abe9c3659921c50cc4468a1a4f984f5 23-Jan-2010 Raphael <raphael@google.com> Fix windows make: layoutlib_api moved to sdk.git too.

Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
/build/make/core/main.mk
44f6dde6a505a261e6074b77e141e4a29cc7dab0 13-Jan-2010 Raphael Moll <raphael@google.com> am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair

Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'

* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
Add etc1tool to Windows SDK.
4e7b0e21c538fc44b616aa4c9e8a2f3e933ce545 12-Jan-2010 Raphael <raphael@google.com> Add etc1tool to Windows SDK.

SDK BUG 2368918

This depends on Change I83485145 from development.git.

Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
/build/make/core/main.mk
75127b769e20490f3348802e6b708d67c60c2b04 07-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Remove special-handling of the restricted tag.

Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.

Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
/build/make/core/main.mk
6907cfe7de2007b0320f4606d9ea62da2062d3ca 07-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Remove special-case where CLASS=apps ignored TAGS=user

Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
/build/make/core/main.mk
64b00e3f98a15db0ef6dfe83e3c2141b9b483631 17-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800

Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800

Enable building stagefright in all builds, make stagefright the default player.
/build/make/core/main.mk
c3d743d262cd69e817524f8a4e5554ef29ffa837 19-Nov-2009 Raphael <raphael@google.com> am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2

* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
6f5cb991f61acbc21090c3744d5bf16b01b7aa52 19-Nov-2009 Raphael <raphael@google.com> am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
81d88c31be80493886e6844ebf8af8a03273208c 19-Nov-2009 Raphael <raphael@google.com> am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair

* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
f15e028fe822069e44b0e06fa91f537048538f94 19-Nov-2009 Raphael <raphael@google.com> am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair

* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
d920ec8354940653e6cf53a1540360cca3bcc5f7 18-Nov-2009 Raphael <raphael@google.com> Fix a Windows-only discrepency in the Windows SDK build.

For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.

Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
/build/make/core/main.mk
a62a442129a28bf3a62139183868a13b91e976ad 18-Nov-2009 Raphael <raphael@google.com> Fix the Windows SDK build for the development to sdk split.

Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
/build/make/core/main.mk
573205f4838cf0369fd6a7028c793726d1eb8620 18-Nov-2009 Dan Egnor <egnor@google.com> Remove external/googleclient (the code moved elsewhere)
/build/make/core/main.mk
170e1d59f6cf8176c30a5672267fb8be6d1076c6 04-Nov-2009 Fred Quintana <fredq@google.com> add the new accounts and sync package to the generic target and enable sync for all builds
/build/make/core/main.mk
aa569862dee45bfa72d342e9982cb5205df9bf04 13-Oct-2009 Raphael <raphael@google.com> Windows SDK: support tools/sdklauncher and tools/layoutopt

Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
/build/make/core/main.mk
0889661cd890e49a4827da0dc5d583274347d178 07-Oct-2009 Joe Onorato <joeo@android.com> eng builds only -- make the thing that makes setupwizard optional actually work.
/build/make/core/main.mk
28fcfdd7dd8752bc9accf800306d82a3a8d138da 19-Aug-2009 Raphael <raphael@google.com> Fix broken server Windows SDK build.

I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
/build/make/core/main.mk
f6ff4c5acf428d4b0cba828b836f1e11fa1442b4 18-Aug-2009 Raphael <raphael@google.com> Windows: Fix platform build.
/build/make/core/main.mk
cac4dccb0a12e4be95acbd0d3f091c86c35895ca 12-Aug-2009 Raphael <raphael@google.com> am 31a8ac22: BUG 1993354 : Add zipalign to Windows SDK

Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'

* commit '31a8ac22585b2a8263892487bd38b64783402e06':
BUG 1993354 : Add zipalign to Windows SDK
31a8ac22585b2a8263892487bd38b64783402e06 12-Aug-2009 Raphael <raphael@google.com> BUG 1993354 : Add zipalign to Windows SDK
/build/make/core/main.mk
dc1a728fb89677589bf3b5e3a5aab58164c9be6b 04-Aug-2009 Joe Onorato <joeo@android.com> Rewrite findleaves.sh in python

This cuts the make startup time by about 30 seconds. Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.

This is from my mac laptop:

$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null

real 0m29.186s
user 0m0.550s
sys 0m5.897s

$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null

real 0m4.701s
user 0m0.645s
sys 0m1.294s

$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real 0m0.176s
user 0m0.094s
sys 0m0.080s
/build/make/core/main.mk
1de66889ec97300eb92166e849c4f9251e0290c6 30-Jul-2009 Joe Onorato <joeo@android.com> Don't check build tools versions (including javac) every time make is run.

This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
/build/make/core/main.mk
ead9646f1f7ab91fd5738471acc706faeb99dc72 30-Jul-2009 Joe Onorato <joeo@android.com> Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.

This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
/build/make/core/main.mk
b7c41aaad02e39e692362d0f2eed86c3e2008271 20-Jul-2009 Joe Onorato <joeo@android.com> Add a separate version of the docs build that only does the stubs.

That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
/build/make/core/main.mk
f2bce89880db7e88e68085d399392564b3d2dbf2 18-Jul-2009 Joe Onorato <joeo@android.com> am e334d255: Speed up the full build.

Merge commit 'e334d255dc8f85d610f4d0339227a0b985494811'

* commit 'e334d255dc8f85d610f4d0339227a0b985494811':
Speed up the full build.
e334d255dc8f85d610f4d0339227a0b985494811 17-Jul-2009 Joe Onorato <joeo@android.com> Speed up the full build.

Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.

This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes. That's not as much of an improvement
as I had hoped for, but it's still better.

There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory. Before this change, it was an
accident that the directory for that file existed!
/build/make/core/main.mk
8e879ba1c5fe11623b4048cf318afca47a3433c5 08-Jul-2009 San Mehat <san@google.com> Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."

This reverts commit ff2c9deb7966f79572d502a7048a3e6f0f9939b8.

This breaks SD cards on the device (always installs the emulator vold.conf)
/build/make/core/main.mk
04edc95a328d509b8a51123f891d396256bc409c 06-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master

Conflicts:
core/apicheck_msg_current.txt
87c86573e051602ddc2759857c961fe5124bc22a 23-Jun-2009 Patrick Scott <phanna@android.com> Move the BoardConfig.mk search and inclusion to core/config.mk.

This allows TARGET_ARCH_VARIANT to be set by the vendor before we choose the
architecture in core/combo/select.mk.

Also add a primitive armv7-a.mk for turning on hardware floating point.
/build/make/core/main.mk
6178e239e6c5932173c467bd761d998f4771d165 23-Jun-2009 Joe Onorato <joeo@android.com> am 9d9f3678: Java 1.5 is required. Enforce it.

Merge commit '9d9f367895655411c42123177ae1c32f104b3c01'

* commit '9d9f367895655411c42123177ae1c32f104b3c01':
Java 1.5 is required. Enforce it.
9d9f367895655411c42123177ae1c32f104b3c01 23-Jun-2009 Joe Onorato <joeo@android.com> Java 1.5 is required. Enforce it.
/build/make/core/main.mk
1f04a3b8f4c4e886e8abd9a5a1076334ae12124e 09-Jun-2009 Patrick Scott <phanna@android.com> Fix the is_sdk_build check when installing the apns.

This will install the big list of apns on non-sdk eng builds. This is very
helpful after a wipe data for those of us on Cingular.
/build/make/core/main.mk
81d04d57f25e69dc95848590a584865bf47c0948 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a0bad432: Merge change 3237 into donut

Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
Add archquery to the windows make
d8a6ac100009f2fb158e26d9f7199d800eb57887 05-Jun-2009 Raphael <raphael@google.com> Add archquery to the windows make
/build/make/core/main.mk
4afb4f20fcedb5fee6af9faf2bf361808d183132 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 3026e96d: Merge change 2245 into donut

Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
Define TARGET_CPU_ABI for finding native code in .apks
ecc70d705ab8ad6461f23d8be97791227f4219ea 22-May-2009 Dianne Hackborn <hackbod@google.com> Define TARGET_CPU_ABI for finding native code in .apks
/build/make/core/main.mk
a3072e5ae5556858a3159fe81734d05798a3c5bc 15-May-2009 Joe Onorato <joeo@android.com> am eefd0212: Print the platform version and version codename in the big build header.

Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
Print the platform version and version codename in the big build header.
eefd0212f10ec83b21d1792130b4cad02d2ce4d5 13-May-2009 Joe Onorato <joeo@android.com> Print the platform version and version codename in the big build header.
/build/make/core/main.mk
bf1de8cbc9d4d4e60b17b06004fde7859e9b2822 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am a47b47a: Merge change 530 into donut

Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
Remove obsolete activitycreator from windows SDK makefile.
98dce16df0356a5d43b1c6e201bceba0ce453202 24-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/donut'
9058e7293e045b576b19101e41b65f67f8f6309b 24-Apr-2009 Raphael <raphael@google.com> Remove obsolete activitycreator from windows SDK makefile.
/build/make/core/main.mk
a779a05e7eecf91d33590787075a8cbef4c270ac 16-Apr-2009 Raphael Moll <> AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146498
/build/make/core/main.mk
e53ceac5e22e29b69d324c6beed7aff094df957a 15-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
a190c523afcee348359ff7e6f6487b5b3742a448 14-Apr-2009 Raphael Moll <> AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...

Automated import of CL 145983
/build/make/core/main.mk
eb19b3e0d1189cc7833f185a067c9f80b5487707 14-Apr-2009 Joe Onorato <> AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146003
/build/make/core/main.mk
743e250b3010408ec92903f7de009f059c61ffb3 13-Apr-2009 Andy McFadden <> AI 145942: Enable type-precise GC on sapphire builds.

Automated import of CL 145942
/build/make/core/main.mk
a7bfb4f382af7c73771282fb395d47f5f374887a 13-Apr-2009 Raphael Moll <> AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
BUG=1778786

Automated import of CL 145911
/build/make/core/main.mk
03fbe40d5346eb4d5258aa55a00a9a7cb18f8551 13-Apr-2009 Joe Onorato <> AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...

Automated import of CL 145850
/build/make/core/main.mk
15ca0bd5d0a028fd8e42f72a45f17d8e1ee67485 09-Apr-2009 Joe Onorato <> AI 145512: SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory

Automated import of CL 145512
/build/make/core/main.mk
f3e79f904198f69ca2a954c4750a174c41d1c7a2 07-Apr-2009 Xavier Ducrohet <> AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 144767
/build/make/core/main.mk
6a769427c85343e85fe733b1a7c6115b3c8ef291 07-Apr-2009 Xavier Ducrohet <> AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
Merged from: //branches/cupcake/...

Automated import of CL 144765
/build/make/core/main.mk
f39ac4218bbe3a0e07738d92675b23cad6484b63 07-Apr-2009 Xavier Ducrohet <> AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
/build/make/core/main.mk
ff2c9deb7966f79572d502a7048a3e6f0f9939b8 01-Apr-2009 David 'Digit' Turner <digit@android.com> Ensure that /system/etc/vold.conf is created in the "generic" product.
This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
/build/make/core/main.mk
d9b64e1350fabfeac1c4d31c7a773302be01b3bf 01-Apr-2009 Raphael Moll <> AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143880
/build/make/core/main.mk
a401b054a44c3ee72912542d66d41293bdb33b65 01-Apr-2009 Raphael Moll <> AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
Merged from: //branches/cupcake/...

Automated import of CL 143879
/build/make/core/main.mk
e340277c06a67db89d1de1205a8014ee871de2c2 01-Apr-2009 Raphael Moll <> AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
/build/make/core/main.mk
6bce2058567443a02cf80ee3692ff97139b63579 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
/build/make/core/main.mk
fdd3a1020cc63c9f2440f3cff814318d11d6c773 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
/build/make/core/main.mk
2f31293ba78695cb48ac5a1cab835197ace58d47 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
/build/make/core/main.mk
88b607994a148f4af5bffee163e39ce8296750c6 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/build/make/core/main.mk
05806d7af62e07c6225b2e7103a1b115ecf6c9ad 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/build/make/core/main.mk
094268cf8cb37b9d904c8a1e3559cdd46d73cf66 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
/build/make/core/main.mk
a9b22497534d404bf956cdcc0941e20057219a2a 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
/build/make/core/main.mk
4d23ccc023c8b98eb97a7cce820aa80bff2f3522 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
/build/make/core/main.mk
41977d7cd2f0676a1b135a0991545721d6dce3ef 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
/build/make/core/main.mk
475fa12adef8fc2b08290555a33dc8a9fef05be4 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
/build/make/core/main.mk
35cfb08c588ba0af98ad0845ced6a9eeeeca4054 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
/build/make/core/main.mk
66339ad5cebeae8f4cbf7e335c67368abbb91223 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
/build/make/core/main.mk
4f85cc54b3347e00e32a07cae4fd5473987b71af 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
/build/make/core/main.mk
dcc08f073b6873c69ab891d4f69f7c568e282df7 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/build/make/core/main.mk
b6c1cf6de79035f58b512f4400db458c8401379a 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/build/make/core/main.mk