Raphael Moll
16166e5727
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
2011-02-03 18:07:50 -08:00
Raphael Moll
5c6069d632
am ed191898
: am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
SDK: Enable "make sdk/common" under Windows
2011-02-03 11:45:21 -08:00
Raphael Moll
ed19189877
am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
2011-02-03 11:42:34 -08:00
Raphael Moll
192d1ef6d7
SDK: Enable "make sdk/common" under Windows
...
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Brian Swetland
678c7ac997
am d7798a7e
: fix TINY ANDROID yet again...
...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland
d7798a7e1b
fix TINY ANDROID yet again...
...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -08:00
Ying Wang
0864d01001
am 9bc858c4
: am 9c0f3e35
: Build only userdata.img.
...
* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
Build only userdata.img.
2011-02-01 16:39:03 -08:00
Ying Wang
9c0f3e3551
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
2011-02-01 14:59:12 -08:00
Ying Wang
3d85bbd288
Merge "Add modifier goal incrementaljavac"
2011-01-24 10:59:15 -08:00
Brian Swetland
7cc2440994
make TINY_ANDROID build without the presence of frameworks/* and development/*
...
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Brian Swetland
72bf09d333
tiny android: include su
...
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
2011-01-23 17:06:58 -08:00
Ying Wang
015edd2c1b
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
2011-01-21 17:49:30 -08:00
Brian Swetland
a7600364fe
fix tiny android build
...
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
2011-01-20 15:34:39 -08:00
Raphael
d3e6fcbe6c
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
2011-01-12 13:33:04 -08:00
Ying Wang
228fcef025
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
2010-12-08 20:07:48 -08:00
Jean-Baptiste Queru
493ab6449c
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'
2010-11-23 10:54:22 -08:00
Jean-Baptiste Queru
ce5d7e04a8
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'
2010-11-23 10:51:44 -08:00
Magnus Bäck
6ba4ebf272
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
2010-11-23 10:36:50 -08:00
Bruce Beare
885b6b99d3
Correct makefile test for stagefright build
...
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Ying Wang
cc6c8cb856
am 92cc4c07
: am b26a65b5
: Merge "Restrict make version to 3.81"
...
* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
2010-11-19 10:27:47 -08:00
Ying Wang
92cc4c0747
am b26a65b5
: Merge "Restrict make version to 3.81"
...
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
2010-11-19 10:24:57 -08:00
Kenny Root
824d7b2f02
Fix typo in ALL_PREBUILT error message
...
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
2010-11-18 14:27:00 -08:00
Ying Wang
4f9269ef75
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
2010-11-18 11:18:52 -08:00
Xavier Ducrohet
8d458ab320
am f5f81fc7
: am 01a9840b
: Merge "Rename layoutlib_utils into ide_common"
...
* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
2010-11-11 15:01:52 -08:00
Xavier Ducrohet
f5f81fc75e
am 01a9840b
: Merge "Rename layoutlib_utils into ide_common"
...
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
2010-11-11 14:59:57 -08:00
Xavier Ducrohet
2e5ee27e9e
Rename layoutlib_utils into ide_common
...
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Daniel Sandler
9566122c9d
make help: prints a handy list of useful targets
...
A small step to making the platform build environment more
self-documenting.
Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
2010-10-28 15:40:06 -04:00
Ying Wang
7522f04a4b
Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
...
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
2010-10-11 16:33:37 -07:00
Joe Onorato
64cf5aa667
Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"
...
This reverts commit 95e743a6c0
.
2010-10-08 17:01:50 -04:00
Jean-Baptiste Queru
95e743a6c0
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
2010-10-07 16:08:46 -07:00
Dima Zavin
531f524256
core: Make fake packages have real installed files for proper dependencies
...
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
2010-09-27 17:37:59 -07:00
Ying Wang
e874e23a3c
resolved conflicts for merge of dc45f86a
to master
...
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
2010-09-27 12:05:56 -07:00
Ying Wang
dc45f86af8
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.
2010-09-27 11:52:45 -07:00
Ying Wang
0235237805
Remove emulator-based dexpreopt logic from the build system.
...
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
2010-09-27 10:37:25 -07:00
Jean-Baptiste Queru
49ce545ad5
Disable this check that was submitted by mistake.
...
There's still one device that doesn't build with this check enabled.
Change-Id: I962afe9c739df15e77ead30311c34be411674f53
2010-09-26 15:03:43 -07:00
Dima Zavin
c2901aa513
core: don't add file deps for modules without any installed files
...
Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
2010-09-26 14:58:28 -07:00
Jean-Baptiste Queru
0944771fb0
Issue an error when unknown files are added to ALL_PREBUILT
...
Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
2010-09-26 13:16:35 -07:00
Ying Wang
3efd768a0d
resolved conflicts for merge of 9f28f0d7
to master
...
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang
9f28f0d76e
am e7874c43
: Integrate dexpreopt into the build system.
...
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -07:00
Ying Wang
e7874c4308
Integrate dexpreopt into the build system.
...
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Ying Wang
1613f4ff1e
resolved conflicts for merge of 554402f7
to master
...
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
2010-09-22 14:11:49 -07:00
Jesse Wilson
fed45d859a
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.
2010-09-22 13:53:41 -07:00
Ying Wang
554402f76d
am 38a3161d
: String literal change.
...
Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp
* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
2010-09-22 13:14:49 -07:00
Ying Wang
38a3161dc7
String literal change.
...
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
2010-09-22 13:06:34 -07:00
Jesse Wilson
77070aa757
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.
2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3
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
2010-09-22 11:39:18 -07:00
Ying Wang
b368bba41c
Enforce 64-bit build environment
...
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
2010-09-22 11:02:09 -07:00
Ying Wang
0153446b79
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
2010-09-15 17:53:22 -07:00
Ying Wang
6674ec30bb
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
2010-09-15 11:58:41 -07:00
Ying Wang
db2cb63612
Change "make PRODUCT-XXX-tests" to build only tests-build-target
...
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
2010-09-14 16:32:12 -07:00