Commit Graph

24213 Commits

Author SHA1 Message Date
Colin Cross f8f448b3ca Merge "Build with kati+ninja when USE_NINJA=true" 2015-07-24 18:43:58 +00:00
Brian Carlstrom 885f7a2bdb am 517daeb6: am 73a2a902: Merge "Remove unneeded aapt dependency"
* commit '517daeb63388d153102d92f93a0c7e772360df83':
  Remove unneeded aapt dependency
2015-07-24 04:40:48 +00:00
Brian Carlstrom 517daeb633 am 73a2a902: Merge "Remove unneeded aapt dependency"
* commit '73a2a9028f6feae81a2734e0dd4bdc4e13f66efd':
  Remove unneeded aapt dependency
2015-07-24 04:24:46 +00:00
Brian Carlstrom 73a2a9028f Merge "Remove unneeded aapt dependency" 2015-07-24 04:10:25 +00:00
Colin Cross 3b324cb32e 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
2015-07-23 17:29:01 -07:00
Brian Carlstrom 1a71f951a7 Remove unneeded aapt dependency
Change-Id: Ie9b550367f7c6b91d46dc2506c420a45b0d39703
2015-07-23 17:12:10 -07:00
Colin Cross 650fc5b343 am d2efaea1: am 8291ad58: Merge "Add build subprojects to .gitignore"
* commit 'd2efaea1a2f8d844b556cbc12fb2f1c017a80322':
  Add build subprojects to .gitignore
2015-07-23 22:38:34 +00:00
Colin Cross d2efaea1a2 am 8291ad58: Merge "Add build subprojects to .gitignore"
* commit '8291ad587e232b4046158f077194fc981a691a16':
  Add build subprojects to .gitignore
2015-07-23 22:19:37 +00:00
Colin Cross 8291ad587e Merge "Add build subprojects to .gitignore" 2015-07-23 22:11:31 +00:00
Colin Cross c3596d6766 Add build subprojects to .gitignore
Add blueprint, kati, and soong subdirectories to .gitignore so nothing
gets committed there when new subprojects are added to the manifest.

Change-Id: I888b94a89c87d99c8d28e8abd07a830f9cd86702
2015-07-23 13:18:47 -07:00
Ying Wang 6c4176e2d0 am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
  Cleanups.
2015-07-23 02:06:39 +00:00
Ying Wang f5e94cc17f am c677675c: am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit 'c677675cccc8a6894b45469a9b8b4f72efe99b9d':
  Create OUT_DIR before writing build_number.txt.
2015-07-23 02:06:37 +00:00
Ying Wang 66be41da74 am b22469a8: am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit 'b22469a8c50510e141a74932acc3fa17a9dd356c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-23 02:06:18 +00:00
Colin Cross 8d9dfa3d9b resolved conflicts for merge of 8c25fd56 to mnc-dev-plus-aosp
Change-Id: I318ce3d7bbfbcaf849a36543662f4c63b7377927
2015-07-22 19:01:07 -07:00
Dan Albert 9bcedd646e am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
* commit '215959e77d345899fbafa20f765b497b3ac37301':
  Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-22 20:17:28 +00:00
Ying Wang 8b4d143239 am cd7dfdb4: Merge "Cleanups."
* commit 'cd7dfdb4bf3f7d431d2a37908c550a83a282bf22':
  Cleanups.
2015-07-21 23:57:42 +00:00
Ying Wang c677675ccc am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit '83568a6d884f695854d5f7ffe79e465db061dcaa':
  Create OUT_DIR before writing build_number.txt.
2015-07-21 23:57:41 +00:00
Ying Wang cd7dfdb4bf Merge "Cleanups." 2015-07-21 23:45:42 +00:00
Ying Wang 83568a6d88 Merge "Create OUT_DIR before writing build_number.txt." 2015-07-21 23:44:45 +00:00
Ying Wang 06332732a4 Create OUT_DIR before writing build_number.txt.
Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
2015-07-21 16:39:46 -07:00
Ying Wang bbd4755647 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
2015-07-21 16:03:19 -07:00
Dan Albert 215959e77d Revert "Revert "Hide unwinder symbols in each binary.""
Bug: 18471342
Bug: 19958712
This reverts commit 61f675bb53.

Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
(cherry picked from commit 686a557689)
2015-07-21 15:51:10 -07:00
Ying Wang b22469a8c5 am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '65259743e45886a2941771716b92db91de35ea8c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:22:53 +00:00
Ying Wang 65259743e4 Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]" 2015-07-21 21:09:23 +00:00
Ying Wang 57d9060ffd Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
  so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.

Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
(cherry-pick from commit c671a7cf5c)
2015-07-21 14:07:50 -07:00
Ying Wang c7a57e0756 am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:01:37 +00:00
Colin Cross 8c25fd565a am 1d0f6eb1: Merge "Read BUILD_NUMBER from file in rules"
* commit '1d0f6eb115e4fd0093bd3d026264e579689a57c3':
  Read BUILD_NUMBER from file in rules
2015-07-21 19:31:47 +00:00
Colin Cross 1d0f6eb115 Merge "Read BUILD_NUMBER from file in rules" 2015-07-21 19:20:37 +00:00
Evgenii Stepanov c83e26bd3a am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit 'b837687362903dab10afbf76f5d387586a6e264f':
  Disable relocation packer in SANITIZE_TARGET mode.
2015-07-21 18:26:15 +00:00
Tao Bao 1358123688 am a04e6b89: am dd68e68f: Merge "Override properties that point to out/ directory."
* commit 'a04e6b89ec262f4dd38c9d80ee05ce313bab9347':
  Override properties that point to out/ directory.
2015-07-21 18:25:36 +00:00
Colin Cross e8d465f36b resolve conflicts for merge of 89675456 to mnc-dev-plus-aosp
Change-Id: Id9478ab85c9caa7989b748e505020d486156fd95
2015-07-21 10:58:58 -07:00
Evgenii Stepanov b837687362 am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."
* commit 'db38e7b5d407a438d05fc300b432cc83692643d8':
  Disable relocation packer in SANITIZE_TARGET mode.
2015-07-21 17:44:47 +00:00
Evgenii Stepanov db38e7b5d4 Merge "Disable relocation packer in SANITIZE_TARGET mode." 2015-07-21 17:30:03 +00:00
Tao Bao a04e6b89ec am dd68e68f: Merge "Override properties that point to out/ directory."
* commit 'dd68e68fdd413fe93b78c648e2564c3c3c5e5cc3':
  Override properties that point to out/ directory.
2015-07-21 05:13:04 +00:00
Tao Bao dd68e68fdd Merge "Override properties that point to out/ directory." 2015-07-21 05:01:49 +00:00
Ying Wang c671a7cf5c Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
  so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.

Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
2015-07-20 21:26:53 -07:00
repo sync 896754566f resolved conflicts for merge of b097c416 to stage-aosp-master
Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6
2015-07-21 12:31:17 +09:00
Ying Wang 590ec84200 am 55fc58cb: am b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit '55fc58cb8f0a53151de48635c5f452bc10691e52':
  Auto-clean host tools when switching between apps_only and platform build.
2015-07-21 02:34:53 +00:00
Dan Albert 198ffa2305 am 68b828e2: am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit '68b828e21699d15eed9166cb37b1cc31bbcee884':
  Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-21 02:34:34 +00:00
Shinichiro Hamaji b097c41630 Merge "Do not update previous_XXX.mk when there is no change" 2015-07-21 01:32:41 +00:00
Ying Wang 55fc58cb8f am b74823e2: (-s ours) Merge "Auto-clean host tools when switching between apps_only and platform build."
* commit 'b74823e2ff5de41f3bee87f2de76abe6ff4e617f':
  Auto-clean host tools when switching between apps_only and platform build.
2015-07-21 00:45:57 +00:00
Shinichiro Hamaji 14da1424e0 Do not update previous_XXX.mk when there is no change
I'm adding a rule which regenerates ninja files to kati:

8666cfba20

With this regeneration rule, unnecessary re-generation will happen
when these .mk files are updated even if there are no changes in
their contents. With this patch, these .mk files are updated only
when the contents will be actually changed.

Change-Id: I4c796f9454502f6bb25019b3806ca577ea5258c1
2015-07-21 09:40:02 +09:00
Ying Wang b74823e2ff Merge "Auto-clean host tools when switching between apps_only and platform build." 2015-07-21 00:32:35 +00:00
Ying Wang d37b540a39 Auto-clean host tools when switching between apps_only and platform build.
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
(cherry-pick from commit 036b53b6de)
2015-07-20 17:31:08 -07:00
George Mount a584135544 DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
Bug 22175560

Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
2015-07-20 16:48:58 -07:00
Evgenii Stepanov 4b396e47eb Disable relocation packer in SANITIZE_TARGET mode.
Workaround for
https://code.google.com/p/address-sanitizer/issues/detail?id=387.

Change-Id: I151c3f0eb7e2a4c92a64192a0b43ac17646eab5c
2015-07-20 16:32:53 -07:00
Dan Albert 68b828e216 am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""
* commit 'f4ffafb1a3a2d103105650fcd9720aa390360a12':
  Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-20 23:23:58 +00:00
Dan Albert f4ffafb1a3 Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 2015-07-20 23:11:59 +00:00
Tao Bao 84e7568b1f Override properties that point to out/ directory.
A few properties are stored as links to the files in the out/
directory, which are no longer available when (re)packing from
target_files zip. Redirect those properties to the actual files in
the unzipped directory when repacking.

Change-Id: I18e930cbea224ab9c6db8d4e721b1c266a671db6
2015-07-19 08:48:09 -07:00
Colin Cross f37b455858 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
2015-07-18 12:15:04 -07:00