Colin Cross
09e82eb89a
Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1 am: 235e342639
...
am: 916de9606b
2017-03-21 19:44:13 +00:00
Colin Cross
916de9606b
Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1
...
am: 235e342639
2017-03-21 19:40:11 +00:00
Colin Cross
235e342639
Merge changes I0508b2cc,I3d6bbc36
...
am: 767cb900a1
2017-03-21 19:37:14 +00:00
Colin Cross
31060fdde1
Don't desugar static java libraries
...
Static java libraires are designed to be included in another
java library. If desugar runs on the static java library,
the resulting jar will contain the desugared lambda classes.
When the static jar is included into another java library
and desugar runs again, it desugars the static java library
classes again, producing the same desugared lambda classes
and colliding in the final jar.
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I0508b2cc9c56dbbd4ac0aba44fb99ea2a27715e0
2017-03-21 10:23:45 -07:00
Colin Cross
d01997faa6
Use DEFAULT_APP_TARGET_SDK for dx and desugar
...
DEFAULT_APP_TARGET_SDK is PLATFORM_VERSION_CODENAME (for example 'P')
for non-release builds, and PLATFORM_SDK_VERSION (for example 25) for
release builds. Use it for dx and desugar, and translate
PLATFORM_VERSION_CODENAME to 10000 to enable features in the current
development version.
Bug: 36087246
Bug: 36118520
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I3d6bbc36a8869e4ced6bb850bc32f37b4cba3f85
2017-03-21 10:23:45 -07:00
Dan Willemsen
a471822a57
Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE" am: d69837deea am: 6acc699303
...
am: ac6291f639
2017-03-21 06:16:51 +00:00
Dan Willemsen
ac6291f639
Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE" am: d69837deea
...
am: 6acc699303
2017-03-21 06:12:51 +00:00
Dan Willemsen
6acc699303
Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE"
...
am: d69837deea
2017-03-21 06:08:20 +00:00
Treehugger Robot
d69837deea
Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE"
2017-03-21 06:02:14 +00:00
TreeHugger Robot
19453bfe7d
Merge "Use BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for system props split (2)"
2017-03-21 05:32:32 +00:00
Dan Willemsen
05a2b931e9
Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE
...
The vendor image will have more than just proprietary modules in it
under Treble, so let's stop marking open source code as proprietary just
to move it to vendor.
Bug: 36452052
Test: compare build-aosp_arm.ninja before/after, no changes.
Test: Try defining LOCAL_VENDOR_MODULE / LOCAL_PROPRIETARY_MODULE in the
same and different ways, ensure it works.
Change-Id: I0ab046bcb7563a20d44ed00667e18497ef0873a8
2017-03-20 20:57:04 -07:00
Jaekyun Seok
04a168f86b
Use BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for system props split (2)
...
http://ag/1955051 is already submitted for the same purpose, but this
was missed from it.
Test: building succeeded and tested with sailfish
Bug: 34116668
Change-Id: I662b68d5b07e65bfdcf41fcd0782640582246318
2017-03-21 11:46:49 +09:00
Jin Qian
cbe0e25af2
Merge "Revert "device-tests: As a dependency to tests"" am: 5b216025ba am: 9c0b12db47
...
am: e95bc4fc6d
2017-03-21 01:14:02 +00:00
Jin Qian
e95bc4fc6d
Merge "Revert "device-tests: As a dependency to tests"" am: 5b216025ba
...
am: 9c0b12db47
2017-03-21 01:09:59 +00:00
Jin Qian
9c0b12db47
Merge "Revert "device-tests: As a dependency to tests""
...
am: 5b216025ba
2017-03-21 01:06:00 +00:00
Jin Qian
5b216025ba
Merge "Revert "device-tests: As a dependency to tests""
2017-03-21 01:03:08 +00:00
Jin Qian
df086140a8
Revert "device-tests: As a dependency to tests"
...
This reverts commit f153603ccc
2017-03-21 01:00:41 +00:00
Dan Willemsen
6be7d01e05
Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a am: 35bdbdfdc3
...
am: 0a5905c139
2017-03-20 23:21:22 +00:00
Dan Willemsen
0a5905c139
Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a
...
am: 35bdbdfdc3
2017-03-20 23:18:51 +00:00
Dan Willemsen
35bdbdfdc3
Merge "Remove USE_SOONG_UI=false"
...
am: ebf57f6f0a
2017-03-20 23:14:51 +00:00
Treehugger Robot
ebf57f6f0a
Merge "Remove USE_SOONG_UI=false"
2017-03-20 23:11:10 +00:00
Dan Willemsen
89edbf61d4
Merge "Use built module instead of installed module for profman" am: 46eeb0580c am: 21f7aa5b2c
...
am: 64c384ed78
2017-03-20 23:07:22 +00:00
Dan Willemsen
64c384ed78
Merge "Use built module instead of installed module for profman" am: 46eeb0580c
...
am: 21f7aa5b2c
2017-03-20 23:03:52 +00:00
Dan Willemsen
21f7aa5b2c
Merge "Use built module instead of installed module for profman"
...
am: 46eeb0580c
2017-03-20 23:00:20 +00:00
Treehugger Robot
46eeb0580c
Merge "Use built module instead of installed module for profman"
2017-03-20 22:46:07 +00:00
Simran Basi
1c90fcbefc
Merge "device-tests: As a dependency to tests" am: 26594fce3f am: 318840dfb6
...
am: e3567c4847
2017-03-20 22:28:51 +00:00
Simran Basi
e3567c4847
Merge "device-tests: As a dependency to tests" am: 26594fce3f
...
am: 318840dfb6
2017-03-20 22:25:48 +00:00
Simran Basi
318840dfb6
Merge "device-tests: As a dependency to tests"
...
am: 26594fce3f
2017-03-20 22:21:48 +00:00
Dan Willemsen
25e9607a46
Remove USE_SOONG_UI=false
...
Test: m -j
Change-Id: I4eccbf9884385f11db84f6e0f28d55d21d06cac3
2017-03-20 14:22:20 -07:00
Dan Willemsen
3d072d547f
Use built module instead of installed module for profman
...
This means that we won't have to rebuild the odex files after an
installclean.
Test: profile.prof is identical before/after
Test: m -j; m installclean; m -j
Change-Id: I53c630ce0c5a985d856e26bd7bb3d8c76958aaab
2017-03-20 14:00:31 -07:00
Simran Basi
f153603ccc
device-tests: As a dependency to tests
...
This change will build device-tests whenever tests is built.
Bug: 35386840
Test: None
Change-Id: If587bf74bb66b7ce5552493c73368bb68b6d34af
2017-03-20 13:14:49 -07:00
Dan Willemsen
402a0aea77
Merge "Revert "install *.so in different paths for their types"" am: 8311d46c86 am: 7195fb8920
...
am: 235042e404
2017-03-17 23:01:53 +00:00
Dan Willemsen
235042e404
Merge "Revert "install *.so in different paths for their types"" am: 8311d46c86
...
am: 7195fb8920
2017-03-17 22:57:23 +00:00
Dan Willemsen
7195fb8920
Merge "Revert "install *.so in different paths for their types""
...
am: 8311d46c86
2017-03-17 22:52:53 +00:00
Treehugger Robot
8311d46c86
Merge "Revert "install *.so in different paths for their types""
2017-03-17 22:45:31 +00:00
Simran Basi
af5c1f3144
Merge "device-tests & general-tests: build out zips." am: dd908dd925 am: 0aa305aacc
...
am: 38c95e4d6d
2017-03-17 17:56:51 +00:00
Simran Basi
38c95e4d6d
Merge "device-tests & general-tests: build out zips." am: dd908dd925
...
am: 0aa305aacc
2017-03-17 17:53:20 +00:00
Simran Basi
0aa305aacc
Merge "device-tests & general-tests: build out zips."
...
am: dd908dd925
2017-03-17 17:50:23 +00:00
Treehugger Robot
dd908dd925
Merge "device-tests & general-tests: build out zips."
2017-03-17 17:45:05 +00:00
Dan Willemsen
de4e71b27b
Revert "install *.so in different paths for their types"
...
This reverts commit 842a985f90
2017-03-16 16:54:40 -07:00
Adam Lesinski
15c6791d76
Merge "Add LOCAL_ASSET_DIR support (-A) to aapt2"
2017-03-16 21:56:23 +00:00
Adam Seaton
f7e320b223
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67 am: 5ce9447af1
...
am: a75eb481bf
2017-03-16 16:53:36 +00:00
Adam Seaton
ca25ed58d2
Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343 am: 4fae4a0fb1
...
am: 93887301f5
2017-03-16 16:53:15 +00:00
Adam Seaton
a75eb481bf
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67
...
am: 5ce9447af1
2017-03-16 16:50:28 +00:00
Adam Seaton
93887301f5
Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343
...
am: 4fae4a0fb1
2017-03-16 16:50:14 +00:00
Adam Seaton
5ce9447af1
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb
...
am: b7baf15d67
2017-03-16 16:47:56 +00:00
Adam Seaton
4fae4a0fb1
Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e
...
am: e815842343
2017-03-16 16:47:44 +00:00
Adam Seaton
b7baf15d67
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd
...
am: f773f981bb
2017-03-16 16:44:57 +00:00
Adam Seaton
e815842343
Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42
...
am: 751d4cd04e
2017-03-16 16:44:44 +00:00
Adam Seaton
f773f981bb
Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7
...
am: d5894faefd
2017-03-16 16:42:00 +00:00
