Ying Wang
4cdbb26ca2
am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit '86162e6439e8035494b187efbf138d9cabae92fb':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:19:15 +00:00
Ying Wang
86162e6439
am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB."
...
* commit 'b1c0a86f7a178a517caf2c815b20bda276935df9':
Bump generic_arm64 system partition size to 1200 MB.
2015-07-27 19:01:49 +00:00
Ying Wang
b1c0a86f7a
Merge "Bump generic_arm64 system partition size to 1200 MB."
2015-07-27 18:48:35 +00:00
Ying Wang
97ba885a7b
Bump generic_arm64 system partition size to 1200 MB.
...
Change-Id: I31740673829e578d7fc0edd895868bf1f21cfe15
2015-07-27 11:01:50 -07:00
George Mount
18240c5247
am 63daab9f: (-s ours) am 21d884f6: (-s ours) am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '63daab9ff52796f95ff3d83a43b4300c2dd8318c':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:42:09 +00:00
George Mount
63daab9ff5
am 21d884f6: (-s ours) am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '21d884f6ac331339db2f46b7dbe2f56286b783a6':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:28:40 +00:00
George Mount
21d884f6ac
am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '0cd3e17f5bc819a45fd824a00ca44c0ea61c1c12':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:16:34 +00:00
George Mount
0cd3e17f5b
am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '18cf7136a686b9fbac837736445ca7f2edd5947e':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 15:02:40 +00:00
George Mount
18cf7136a6
am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit '56f7b77520f182a42e181a0f6dba78559007c532':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 14:49:18 +00:00
George Mount
56f7b77520
am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
...
* commit 'a58413554455248dcaea3ad1c022316c1e3288e7':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 14:35:51 +00:00
Ying Wang
5d7e8dae18
am 3d2c90d1: am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""
...
* commit '3d2c90d18608650614cf3940179cf13251e82178':
Fix mmma uses like "mmma ./external/apache-harmony"
2015-07-24 21:11:05 +00:00
Colin Cross
e53a863044
am 4f4c7c22: am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"
...
* commit '4f4c7c22284729d5c1a256590edd387e9d9798dd':
Build with kati+ninja when USE_NINJA=true
2015-07-24 21:10:51 +00:00
Ying Wang
3d2c90d186
am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""
...
* commit 'cb0314145956c4f918c961e2ecbdfb97a080ac61':
Fix mmma uses like "mmma ./external/apache-harmony"
2015-07-24 19:54:00 +00:00
Ying Wang
cb03141459
Merge "Fix mmma uses like "mmma ./external/apache-harmony""
2015-07-24 19:35:47 +00:00
Ying Wang
a5184806be
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
2015-07-24 12:30:41 -07:00
Colin Cross
4f4c7c2228
am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"
...
* commit 'f8f448b3cac0bebdd8012fec5087af7805885f2d':
Build with kati+ninja when USE_NINJA=true
2015-07-24 18:55:36 +00:00
Colin Cross
f8f448b3ca
Merge "Build with kati+ninja when USE_NINJA=true"
2015-07-24 18:43:58 +00:00
Brian Carlstrom
3e22247e27
am 517daeb6: am 73a2a902: Merge "Remove unneeded aapt dependency"
...
* commit '517daeb63388d153102d92f93a0c7e772360df83':
Remove unneeded aapt dependency
2015-07-24 04:40:55 +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
Dan Albert
b0c28dba2a
am d7e31a39: am 2183dcb2: am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
...
* commit 'd7e31a39953e37111f6bcec92efaba3f27822afe':
Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-24 04:08:43 +00:00
Dan Albert
d7e31a3995
am 2183dcb2: am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
...
* commit '2183dcb2e315c652f1a0dd553098e2fbb6715035':
Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-24 03:02:38 +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
ac676d8a5b
am d2efaea1: am 8291ad58: Merge "Add build subprojects to .gitignore"
...
* commit 'd2efaea1a2f8d844b556cbc12fb2f1c017a80322':
Add build subprojects to .gitignore
2015-07-23 22:38:19 +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
Dan Albert
2183dcb2e3
am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
...
* commit '215959e77d345899fbafa20f765b497b3ac37301':
Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-22 20:23:12 +00:00
Ying Wang
960424bc31
am 8b4d1432: am cd7dfdb4: Merge "Cleanups."
...
* commit '8b4d1432395733db45e2dfaeee24fe44d3c49bbe':
Cleanups.
2015-07-22 00:12:18 +00:00
Ying Wang
4ed70e43a0
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-22 00:12:16 +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
4c252b1156
am a0ef4986: am 80ba4a3f: am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
* commit 'a0ef4986b488227074cb985e85ad07d92e613555':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:45:48 +00:00
Ying Wang
4169f10c97
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-21 21:36:46 +00: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
a0ef4986b4
am 80ba4a3f: am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
...
* commit '80ba4a3fb986b9b536c9118aeb59741f7e206110':
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:15:04 +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
80ba4a3fb9
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:00:55 +00:00
Colin Cross
7302168213
resolved conflicts for merge of 8c25fd56
to mnc-dr-dev-plus-aosp
...
Change-Id: Id97d2e9d2749bf5739ede583462ef83adb1ee60c
2015-07-21 12:54:17 -07: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
28c1081788
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:28:54 +00:00
Tao Bao
5442819cb1
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:28:15 +00:00