aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Fix win_sdk.Raphael Moll2014-05-091-7/+7
| | | | | | Do not invoke atree on windows unless we need it. Change-Id: Ie11cb35bb5e9bccb6665f7d7b9cb92cda2445c8d
* Merge "Disable build of windows SDK Tools"Xavier Ducrohet2014-05-092-35/+20
|\
| * Disable build of windows SDK ToolsXavier Ducrohet2014-05-092-35/+20
| | | | | | | | Change-Id: I6a17e3e7416f693218b41d2eb08ed6a4347a4f27
* | resolve merge conflicts of 5d7058e to master.Xavier Ducrohet2014-05-081-0/+1
|\ \ | |/ |/| | | Change-Id: If2bd442bf53c312e23a822081745f089254e8538
| * Remove sdk tools from the build.Xavier Ducrohet2014-05-085-6/+6
| | | | | | | | Change-Id: I193c6e3e5a2c687149044a998fb631d1cdf6f998
* | Remove sdk tools from the build.Xavier Ducrohet2014-05-085-341/+0
| | | | | | | | | | | | (cherry picked from commit 2f4a938cee43f9b2618762408cb49720f6202e36) Change-Id: I8d95c025e1893cdc5f0f663b1740ef6a09cb677a
* | Merge "Temporarily do not include emulator in win-sdk" into idea133Raphael Moll2014-05-061-19/+20
|\ \ | |/ | | | | | | | | | | Auto-merge: 8d259e9 * commit '8d259e998c9bb3c0b02b52b53680a0edcedc46c9': Temporarily do not include emulator in win-sdk
| * Temporarily do not include emulator in win-sdkRaphael Moll2014-05-051-19/+20
| | | | | | | | | | | | Needed by change I1f88648d60 Change-Id: I33c102beadbbfd97e068df1ec3690e421d2994e1
* | Merge "Temporarily do not include emulator in sdk build." into idea133Raphael Moll2014-05-061-21/+22
|\ \ | |/ | | | | | | | | | | Auto-merge: e6241f8 * commit 'e6241f8fc448fc563ed6bf94da09a292e5919339': Temporarily do not include emulator in sdk build.
| * Temporarily do not include emulator in sdk build.Raphael Moll2014-05-051-21/+22
| | | | | | | | | | | | emulator is currently disabled on macs by change I3740de7ef4. Change-Id: I1f88648d60f8112102b6e04e4d47f7fbe85d266c
* | Merge "Remove zipalign from the SDK tools." into idea133Xavier Ducrohet2014-04-032-4/+0
|\ \ | |/ | | | | | | | | | | Auto-merge: a1d044b * commit 'a1d044b7b46ae23c7d8a0f7253287c2cfeba9edc': Remove zipalign from the SDK tools.
| * Remove zipalign from the SDK tools.Xavier Ducrohet2014-04-022-4/+0
| | | | | | | | Change-Id: If81dcc92ee68a5da7d2c2204a6a12f3220f43919
* | Merge "Add sqlite3 to the sdk product deps."Griff Hazen2014-03-061-2/+2
|\ \
| * | Add sqlite3 to the sdk product deps.Griff Hazen2014-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | | It's needed by the tools atree, and an empty sdk.atree has a build breakage without it. Change-Id: I769918555302d7790199f698801130be7f8b28e7
* | | Resolve merge conflicts of 4a218a8 to master.David 'Digit' Turner2014-03-061-4/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: emulator/qtools/Android.mk Change-Id: Ibde8886543893ce78892da57a6ab9f1fc8678432
| * Fix manual copy of lombok in the tools.Xavier Ducrohet2014-01-031-4/+1
| | | | | | | | | | | | It's now handled by the devtools prebuilts. Change-Id: Iaa99eeff1c499a72fabdab4fefd423fbb0e73f72
* | Remove monitor temporarily from sdk builds (try 2)Siva Velusamy2014-02-126-18/+17
| | | | | | | | | | | | | | | | | | This CL disables building of monitor from the SDK builds. This is because the current PDE build doesn't work with Java7 on Macs. The fix is to move away from PDE builds to Tycho, and that is going to take a while. So we disable monitor until we move to Tycho. Change-Id: Ibd701dc0fbd9b57441fa886fe701dcb71764e83a
* | Revert "Remove monitor temporarily from sdk builds"Siva Velusamy2014-02-124-14/+14
| | | | | | | | | | | | | | This reverts commit 0d723886ab5d3f7cf4ed2102be84fe482eeca3a0. This breaks the windows build with the error: make: *** No rule to make target `monitor', needed by `winsdk-tools'.
* | Remove monitor temporarily from sdk buildsSiva Velusamy2014-02-124-14/+14
|/ | | | | | | | | This CL disables building of monitor from the SDK builds. This is because the current PDE build doesn't work with Java7 on Macs. The fix is to move away from PDE builds to Tycho, and that is going to take a while. So we disable monitor until we move to Tycho. Change-Id: I91282d93d54ed039e5356842e08320833ec441cd
* Rename lombok.jar in tools/lib to match what lint.jar expectsTor Norbye2013-09-171-1/+1
| | | | Change-Id: I415af5e76bb3854a297d67fb0e26f5622f87af9c
* Update template location for SDK buildJosiah Gaskin2013-07-311-4/+4
| | | | | | | | This change removes templates from the SDK source tree (from sdk/templates) and points the build/tools.atree build location file to their new location in tools/base/templates Change-Id: Id37b24eceaae6dcc0b3bf5078a759a337cb13467
* Remove systrace from tools.atreeSiva Velusamy2013-07-191-8/+0
| | | | | | Systrace should be released along with every platform release. Change-Id: Ic6c728906aa6af01ca98200a18dd4685d403f3e0
* Add template for build.gradleJeff Smith2013-06-131-1/+2
| | | | | | | | Provides the template needed by 'android create project' to create the file build.gradle. Change-Id: I689a76573afd2c4d0454deca3ed694f1fb46065e Signed-off-by: Jeff Smith <whydoubt@gmail.com>
* Manually add lombok to the sdk.Xavier Ducrohet2013-05-091-0/+3
| | | | Change-Id: Ifdec4088b2b85ea98d746b5260b57e887c0c3379
* Modified templates for Gradle projectsScott Barta2013-04-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Modifies the existing templates to output Gradle build files with a new multi-level directory structure. The templates continue to work the old way that Eclipse expects, and the new behavior is only enabled if the "isGradle" global is set to "true". Files to configure the Gradle wrapper are placed in the SDK at tools/templates/gradle/wrapper. This CL changes all file copies and merges to go to fully-qualified directories set up via global variables. Things go to the old locations for non-Gradle builds based on how the globals are set up, but Gradle builds can override output directory variables to reflect the new directory structure. This CL also adds NewAndroidLibrary and NewJavaLibrary project templates, which will be used in the future. The current NewAndroidApplication template also can output a library, which is redundant and confusing; this will likely be fixed somehow in the future. Change-Id: Ieb830bdfba1797d87a218326ebd37c99d254758e
* Fix SDK: remove apkbuilder from Windows atree too.Raphael Moll2013-04-101-3/+0
| | | | | | | It has been removed from the linux one and should have been removed from the Windows one too. Change-Id: Ib74a12260d4895749fc48eadc42cbac04f908768
* SDK: Fix typo in atree.Raphael Moll2013-04-091-18/+15
| | | | Change-Id: Ieb0d9009f9471a1b03978b7d640446cf3dbb7e7a
* SDK: Delete projects moved to tools/base or tools/swt.Raphael Moll2013-03-131-74/+0
| | | | Change-Id: Iba15f82cb00d19217382c78d8ff37dda1e97ea59
* Build SDK using prebuilts/devtools.Raphael Moll2013-03-134-94/+79
| | | | Change-Id: I4c1979f8f07d24573b3ff7d7a1fa22d6ea87e5e3
* SDK prebuilts: reorganize into tools/lib.Raphael Moll2013-03-062-96/+96
| | | | | | This must be submitted with prebuilts/devtools' change I3d985ed0abf. Change-Id: Icab479e0e8a5c126b0fdc213a792187a14a44f21
* Use swing worker that is part of Java6Siva Velusamy2013-02-151-1/+0
| | | | | | Remove references to the org.jdesktop version Change-Id: I443ce115e950d678eaaf12eedad758bf56958f91
* Use devtools prebuilts directly in tools.atree.Raphael Moll2013-02-081-30/+30
| | | | Change-Id: I3de04f5887bf8e98d513f36fdc840daa0da55167
* Change more SDK libs to prebuilts.Raphael Moll2013-02-063-10/+5
| | | | | | | | | | | Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2 To update the prebuilts, you need tools/base.git and the prebuilts/devtools/update_jars.sh script. This is supposed to be an intermediary step as we switch to tools/base. Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac
* Fix build breakage.Raphael Moll2013-01-181-1/+1
| | | | Change-Id: Ic861379747ab176a2d97b8e5437a7084988114fb
* Fix atree build by directly referencing SDK prebuilts.Raphael Moll2013-01-161-22/+22
| | | | Change-Id: I967696fa0f26608ec6e847836d96cba81b4de82e
* SDK: use prebuilts/devtools for sdklibRaphael Moll2013-01-162-2/+0
| | | | Change-Id: I55c69a46fb7fa21701025f2df4e4fcc3bfd3ef96
* SDK: use prebuilts/devtools for sdkuilibRaphael Moll2013-01-152-2/+0
| | | | Change-Id: Icd6597be885179bd1f0b49d227ece7a3fa9f9bcb
* Fix build: remove obsolete reference to ddmlib-tests in sdk product.Raphael Moll2013-01-111-1/+0
| | | | Change-Id: Idf569800e8500958308273c3a45e8215b85988aa
* SDK: switch ddmlib to prebuilts/devtools/ddmlib/ddmlib.jarRaphael Moll2013-01-111-1/+0
| | | | | | This also removes the ddmlib-tests.jar module. Change-Id: Id44bcc4b91ee76e22a3a50c000cda1b1e7bb972e
* Change manifmerger & jobb to prebuilts.Raphael Moll2013-01-082-12/+10
| | | | | | | Contrary to the ill-advised change Ic57371dcea, this will just fail if the prebuilts are not present instead of trying to rebuilt them. Change-Id: I019b0369686ae6ed5a507d05209ea68919174f97
* Merge "Revert "SDK: Use prebuilds/devtools for manifmerger and jobb JAR ↵Raphaël Moll2013-01-042-10/+12
|\ | | | | | | libraries.""
| * Revert "SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries."Raphaël Moll2013-01-042-10/+12
| | | | | | | | | | | | This reverts commit 98df0cd625983742fc6dec224b0e2ce8fe6e74f6 Change-Id: I9ecadde8f4ac6208daaf15b3108e880a50fd39ce
* | Merge "windows: add external/hamcrest to windows sdk build modules."Raphael Moll2013-01-041-1/+2
|\ \ | |/ |/|
| * windows: add external/hamcrest to windows sdk build modules.Raphael Moll2013-01-031-1/+2
| | | | | | | | | | | | This is required to build under cygwin. Change-Id: I306c05cd60f6bcaba1c0decc335e43d05e769e85
* | SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries.Raphael Moll2013-01-042-12/+10
|/ | | | Change-Id: Ic57371dcea36a94a1173012e7c252cd8cf317c88
* Merge "Remove emulator modules from sdk PRODUCT_PACKAGES"Jesse Hall2012-11-291-15/+0
|\
| * Remove emulator modules from sdk PRODUCT_PACKAGESJesse Hall2012-11-281-15/+0
| | | | | | | | | | | | | | | | These are now added by build.git/target/product/sdk.mk; other products need to build the emulator too, so adding them here isn't appropriate. Bug: 7556265 Change-Id: I85b1ce8b565f23d0ed10979628760c3965f4cceb
* | Merge "Build fix"Tor Norbye2012-11-281-0/+1
|\ \
| * | Build fixTor Norbye2012-11-281-0/+1
| |/ | | | | | | Change-Id: I6a0118bd67c15d4f359d68f744da23223f4aa3df
* | Build fixTor Norbye2012-11-281-0/+1
|/ | | | Change-Id: I7cc2adbb127eaa3472f80451a0d0f7cffcce0473
generated by cgit v1.1 at 2025-01-08 19:06:17 +0000