Dan Willemsen
87e0ce4b8f
Merge changes I9c735fe2,Ib918b2ed am: b51df6d171 am: 6d037230b8
...
am: a5b030a6f1
2016-08-01 23:31:56 +00:00
Dan Willemsen
a5b030a6f1
Merge changes I9c735fe2,Ib918b2ed am: b51df6d171
...
am: 6d037230b8
2016-08-01 23:29:01 +00:00
Dan Willemsen
6d037230b8
Merge changes I9c735fe2,Ib918b2ed
...
am: b51df6d171
2016-08-01 23:25:29 +00:00
Treehugger Robot
b51df6d171
Merge changes I9c735fe2,Ib918b2ed
...
* changes:
Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
Disable auto installclean for AAPT config change
2016-08-01 23:07:53 +00:00
Chih-Hung Hsieh
28b71f0005
Merge "Fix clang-tidy performance warnings." am: 240faf5ef0 am: 644526cfa5
...
am: 068f33b95f
2016-08-01 21:19:53 +00:00
Chih-Hung Hsieh
068f33b95f
Merge "Fix clang-tidy performance warnings." am: 240faf5ef0
...
am: 644526cfa5
2016-08-01 21:17:21 +00:00
Chih-Hung Hsieh
644526cfa5
Merge "Fix clang-tidy performance warnings."
...
am: 240faf5ef0
2016-08-01 21:13:54 +00:00
Treehugger Robot
240faf5ef0
Merge "Fix clang-tidy performance warnings."
2016-08-01 21:04:20 +00:00
Narayan Kamath
9e57e11256
Merge \\\"Update package whitelist to track changes to java.lang.invoke.\\\" am: 8ce8f60a2f am: dbce967b11
...
am: 1668db9c69
2016-08-01 12:35:14 +00:00
Narayan Kamath
1668db9c69
Merge \\"Update package whitelist to track changes to java.lang.invoke.\\" am: 8ce8f60a2f
...
am: dbce967b11
2016-08-01 12:32:14 +00:00
Narayan Kamath
dbce967b11
Merge \"Update package whitelist to track changes to java.lang.invoke.\"
...
am: 8ce8f60a2f
2016-08-01 12:29:17 +00:00
Treehugger Robot
8ce8f60a2f
Merge "Update package whitelist to track changes to java.lang.invoke."
2016-08-01 12:25:04 +00:00
Narayan Kamath
7ee6289f25
Update package whitelist to track changes to java.lang.invoke.
...
The introduction of java.lang.invoke.MethodType and its supporting
classes, in particular.
bug: 30550796
test: make checkbuild
Change-Id: Id2b84d3bb911f4bc5aef0761d357b1e9121030ab
2016-08-01 13:24:14 +01:00
Dan Willemsen
84f4f3b7df
Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
...
Anything product specific in here should be caught by an explicit
dependency, or the command line changing. This drastically reduces the
build time after an installclean.
Before this change, we were re-running all dex2oat commands after each
installclean, even if nothing changed.
Change-Id: I9c735fe2c5d82109d56996021502319179e43671
2016-07-31 16:45:32 -07:00
Dan Willemsen
832932f835
Disable auto installclean for AAPT config change
...
PRODUCT_AAPT_CONFIG and PRODUCT_AAPT_PREF_CONFIG don't affect the
installed file list, they only affect how some files are built. The
changing command line is already noticed by ninja, so we'll only re-run
the necessary commands instead of a full installclean.
Change-Id: Ib918b2edeefc539b7f88cb22a1d751c397973b1d
2016-07-31 15:47:17 -07:00
Dan Willemsen
a8a43036a9
Merge \\\"Refactor LOCAL_INIT_RC\\\" am: cc715fa5d4 am: f8b7ae9c14
...
am: 14d054a5ac
2016-07-30 03:36:18 +00:00
Colin Cross
452328ca3d
Merge \\\"Don\\\'t depend on a phony target\\\" am: 90cd97fd11 am: b3399931a5
...
am: 02b9ce3a23
2016-07-30 03:36:16 +00:00
Dan Willemsen
f666e4d385
resolve merge conflicts of 61ada12 to nyc-mr1-dev-plus-aosp
...
Change-Id: I0a39db916843b7cb034af4390d760d39307e1d14
2016-07-29 20:33:33 -07:00
Dan Willemsen
14d054a5ac
Merge \\"Refactor LOCAL_INIT_RC\\" am: cc715fa5d4
...
am: f8b7ae9c14
2016-07-30 02:09:09 +00:00
Colin Cross
02b9ce3a23
Merge \\"Don\\'t depend on a phony target\\" am: 90cd97fd11
...
am: b3399931a5
2016-07-30 02:09:06 +00:00
Dan Willemsen
61ada1228e
resolve merge conflicts of dd9aee1 to stage-aosp-master
...
am: 922ae6846b
2016-07-30 02:09:06 +00:00
Dan Willemsen
f8b7ae9c14
Merge \"Refactor LOCAL_INIT_RC\"
...
am: cc715fa5d4
2016-07-30 02:06:44 +00:00
Colin Cross
b3399931a5
Merge \"Don\'t depend on a phony target\"
...
am: 90cd97fd11
2016-07-30 02:06:41 +00:00
Dan Willemsen
cc715fa5d4
Merge "Refactor LOCAL_INIT_RC"
2016-07-29 23:44:33 +00:00
Colin Cross
90cd97fd11
Merge "Don't depend on a phony target"
2016-07-29 23:38:28 +00:00
Dan Willemsen
435360a790
Refactor LOCAL_INIT_RC
...
We supported de-duplicating LOCAL_INIT_RC across multiple architecture
variants in a single module definition, but that didn't work if the
module was defined with two different BUILD_PREBUILT definitions. That's
how we're exporting modules from Soong to Make.
Change-Id: Ifc93b15ef78ea3d8e78005d428a3ec57d7e414e8
2016-07-29 15:28:20 -07:00
Colin Cross
723b37e910
Don't depend on a phony target
...
Phony targets are always dirty, depend on the ndk.timestamp file instead
of the ndk phony rule.
Change-Id: I8a90e61a1a79861af59f66f3bc0fdeecd0819992
2016-07-29 15:09:40 -07:00
Dan Willemsen
922ae6846b
resolve merge conflicts of dd9aee1 to stage-aosp-master
...
Change-Id: I4278b9700c8729a06d38acc26e22ce7c340382f2
2016-07-29 14:15:14 -07:00
Dan Willemsen
dd9aee166b
Merge "Record module type statistics"
2016-07-29 20:47:14 +00:00
Dan Willemsen
3bf15e71d3
Record module type statistics
...
Creates a build_system_stats.txt build artifact that contains statistics
on how many BUILD_* modules are defined in a build. Also writes out
information about the Soong module types sent from the Soong build.
Merged-In: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
Change-Id: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
2016-07-29 19:58:35 +00:00
Dan Willemsen
fea31ab9b0
Limit find-copy-subdir-files to just files am: f23e6bfda0
...
am: e132e76adb
2016-07-29 04:46:08 +00:00
Dan Willemsen
e132e76adb
Limit find-copy-subdir-files to just files
...
am: f23e6bfda0
2016-07-29 04:43:05 +00:00
Dan Willemsen
f23e6bfda0
Limit find-copy-subdir-files to just files
...
This is used to add entries to PRODUCT_COPY_FILES -- those should always
be files, not directories or anything else special.
Bug: 30482029
Change-Id: I2691ae81c344c22e518c6b10cd485c73d654a03b
2016-07-28 23:16:45 +00:00
Adam Seaton
2393df24de
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d am: e53fba3ebb am: 65f15a2755
...
am: 0fa084a056
2016-07-28 23:04:57 +00:00
Adam Seaton
0fa084a056
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d am: e53fba3ebb
...
am: 65f15a2755
2016-07-28 23:02:33 +00:00
Adam Seaton
65f15a2755
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d
...
am: e53fba3ebb
2016-07-28 22:59:39 +00:00
Adam Seaton
786e6e11f5
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d am: e53fba3ebb
...
am: 52b32c89ff
2016-07-28 22:59:39 +00:00
Adam Seaton
52b32c89ff
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d
...
am: e53fba3ebb
2016-07-28 22:56:45 +00:00
Adam Seaton
e7a3d11c0c
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9 am: f25aadc812 am: bddec86ed9
...
am: 1ba1261300
2016-07-28 22:55:00 +00:00
Adam Seaton
e53fba3ebb
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2
...
am: 3c8083425d
2016-07-28 22:54:39 +00:00
Adam Seaton
3c8083425d
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14
...
am: 989e951aa2
2016-07-28 22:51:42 +00:00
Adam Seaton
989e951aa2
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55
...
am: 48b6f7db14
2016-07-28 22:49:13 +00:00
Adam Seaton
48b6f7db14
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours
...
am: 41a8f2bd55
2016-07-28 22:47:09 +00:00
Adam Seaton
41a8f2bd55
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197
...
am: ed2fbe64ff
2016-07-28 22:44:37 +00:00
Adam Seaton
1ba1261300
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9 am: f25aadc812
...
am: bddec86ed9
2016-07-28 22:39:13 +00:00
Adam Seaton
845465db6f
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9 am: f25aadc812
...
am: 001e51af1d
2016-07-28 22:36:12 +00:00
Adam Seaton
ed2fbe64ff
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d
...
am: 8118421197
2016-07-28 22:36:12 +00:00
Adam Seaton
bddec86ed9
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9
...
am: f25aadc812
2016-07-28 22:34:12 +00:00
Adam Seaton
001e51af1d
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9
...
am: f25aadc812
2016-07-28 22:34:12 +00:00
Adam Seaton
8118421197
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c
...
am: d6eb8a739d
2016-07-28 22:34:11 +00:00
