Tor Norbye
4377cc701a
Build fix - include sdk/lint in build
...
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
2011-10-20 19:21:30 -07:00
Ying Wang
486be82198
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
2011-10-10 13:10:13 -07:00
Raphael
c36df7b12b
Enable building sdk/avdlauncher in the Win SDK.
...
Required by Change-Id Ic651e3c3 in sdk.git
Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
2011-09-16 09:20:03 -07:00
Raphael
1518506345
Enable 'make traceview' under Windows.
...
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
2011-09-06 16:39:37 -07:00
David 'Digit' Turner
9d99d7dfb8
resolved conflicts for merge of 6da54b6e
to master
...
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
David 'Digit' Turner
6da54b6e0e
resolved conflicts for merge of 7be88d00
to honeycomb-plus-aosp
...
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
Jean-Baptiste Queru
d7d096df71
Tighten the toolchain version check
...
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
2011-08-25 11:29:54 -07:00
David 'Digit' Turner
43dd89d2a0
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
2011-08-23 22:25:13 +02:00
Raphael Moll
88833405c4
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.
2011-08-17 11:36:25 -07:00
Raphael Moll
cfdfad3fca
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.
2011-08-17 11:29:48 -07:00
Raphael Moll
408c7f8a8f
Add sdk/rule_api to the Windows build paths.
...
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Brian Swetland
d1975a2946
fix tiny android builds (add mksh)
...
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
2011-08-16 16:15:26 -07:00
Raphael Moll
b194b9d185
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.
2011-07-29 14:34:01 -07:00
Raphael Moll
dd9e8477e6
am 266a571f
: am dceb4655
: Merge "Add sdk/assetstudio to the Windows build paths."
...
* commit '266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:59:23 -07:00
Raphael Moll
667ec86a33
Add sdk/assetstudio to the Windows build paths.
...
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
Mike Lockwood
40b5a67ecd
Remove obsolete persist.service.adb.enable property from default.prop
...
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 12:31:47 -04:00
David 'Digit' Turner
0ef25320d5
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
2011-06-23 14:29:59 -07:00
David 'Digit' Turner
a85ebfb059
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
2011-06-22 18:05:06 -07:00
David 'Digit' Turner
52d697d432
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
2011-06-22 23:18:57 +02:00
Ying Wang
2914f7f3b3
Relax the constraint of 64bit build environment.
...
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru
70776231ee
am 45a3ad7d
: Merge c1efb060
...
* commit '45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
2011-06-07 18:20:25 -07:00
Jean-Baptiste Queru
45a3ad7d22
Merge c1efb060
...
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
Jean-Baptiste Queru
c1efb06045
am 3c60c67a
: Merge from open-source gingerbread
...
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
Dan Bornstein
f7ad63ae65
Clean up how dex preoptimization gets configured.
...
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
2011-05-31 10:36:55 -07:00
Ying Wang
053dccb159
Relax the constraint of 64bit build environment.
...
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
Raphael Moll
e480e7fd89
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.
2011-04-15 17:33:20 -07:00
Raphael Moll
009e602275
am cb6a22f5
: am 2e4e3c94
: Merge "Allow swtmenubar module to be buildable on Windows."
...
* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
Allow swtmenubar module to be buildable on Windows.
2011-04-15 17:28:36 -07:00
Raphael Moll
cb6a22f591
am 2e4e3c94
: Merge "Allow swtmenubar module to be buildable on Windows."
...
* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
Allow swtmenubar module to be buildable on Windows.
2011-04-15 14:56:41 -07:00
Raphael Moll
59ad18fa49
Allow swtmenubar module to be buildable on Windows.
...
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -07:00
Ying Wang
c3dd0e62c0
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.
2011-04-13 10:34:14 -07:00
Ying Wang
bdbcc65d0e
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.
2011-04-13 10:31:50 -07:00
Ying Wang
7c1a1247f3
Drop using vendor/google/etc/apns-conf.xml for eng builds.
...
Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
2011-04-13 10:18:12 -07:00
Ying Wang
fdc3192e68
resolved conflicts for merge of bd0c91c8
to gingerbread-plus-aosp
...
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
Raphael
bd0c91c8b9
Merge c4d4731b4d
: '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
2011-03-24 13:41:35 -07:00
Raphael
21a8b2459f
Merge c4d4731b4d
: '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
2011-03-24 11:19:07 -07:00
Iliyan Malchev
b375e71d30
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
2011-03-12 14:59:46 -08:00
Ying Wang
f8a7ff191a
resolved conflicts for merge of 123995f9
to honeycomb-plus-aosp
...
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
2011-03-09 17:02:35 -08:00
Ying Wang
123995f9e1
am be188caf
: Dist build.prop in sdk builds.
...
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Ying Wang
be188cafd2
Dist build.prop in sdk builds.
...
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Raphael
c4d4731b4d
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
2011-02-16 20:27:59 -08:00
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