Commit graph

36239 commits

Author SHA1 Message Date
TreeHugger Robot
50ac58a4b8 Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" 2017-03-21 23:32:44 +00:00
Nan Zhang
2deac67a86 Merge "Fixed the issue that dirname: META got zipped twice." am: 8b6458e9a9 am: e22afd4998
am: b7ef9849c3

Change-Id: I6b824a1ae1eb66a98aafc8c0148b0b49006edd8a
2017-03-21 22:40:23 +00:00
Nan Zhang
b7ef9849c3 Merge "Fixed the issue that dirname: META got zipped twice." am: 8b6458e9a9
am: e22afd4998

Change-Id: Ied0d73ed404185b26fa69605b81beccdd8bad6ab
2017-03-21 22:33:24 +00:00
Nan Zhang
e22afd4998 Merge "Fixed the issue that dirname: META got zipped twice."
am: 8b6458e9a9

Change-Id: Idd8eb1727778c52a8abea497477e3999c3d9706d
2017-03-21 22:24:52 +00:00
Treehugger Robot
8b6458e9a9 Merge "Fixed the issue that dirname: META got zipped twice." 2017-03-21 22:15:19 +00:00
Colin Cross
d8bc190a63 Use new naming scheme for TARGET_PLATFORM_VERSION
Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
2017-03-21 14:39:00 -07:00
Nan Zhang
cabecd9c55 Fixed the issue that dirname: META got zipped twice.
When building target-files-package, dir: META has to be copied first
to help early validation of the .zip file.

In order to prevent $(zip_root)/META from getting copied twice to $@.list,
use the method (find -path -prune -o -print) instead of (grep pattern -v).

Test: m target-files-package
Bug: b/31676493
Change-Id: Id6b4d77fb62aa136253de88573cc51a575b90be2
2017-03-21 20:07:41 +00:00
Colin Cross
09e82eb89a Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1 am: 235e342639
am: 916de9606b

Change-Id: I824c89dc8f10912c60313023e5e1eecd610f36e3
2017-03-21 19:44:13 +00:00
Colin Cross
916de9606b Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1
am: 235e342639

Change-Id: I9ed2530dd33c231db92f6e10dcea8b2baaba123f
2017-03-21 19:40:11 +00:00
Colin Cross
235e342639 Merge changes I0508b2cc,I3d6bbc36
am: 767cb900a1

Change-Id: I72a150e3220e249b2601d27606f42f47197e9a2a
2017-03-21 19:37:14 +00:00
Colin Cross
767cb900a1 Merge changes I0508b2cc,I3d6bbc36
* changes:
  Don't desugar static java libraries
  Use DEFAULT_APP_TARGET_SDK for dx and desugar
2017-03-21 19:30:46 +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

Change-Id: I3687f90010d283326d1d3c2ac545fb39b5996a21
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

Change-Id: I382bbf77b3068b9d70a9cc2619d585938ac6718b
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

Change-Id: I4402a902cf1f490445a952904668693b8bc2b7fa
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

Change-Id: I69cb94d34737e1e692015338e40b0708db7ae91f
2017-03-21 01:14:02 +00:00
Jin Qian
e95bc4fc6d Merge "Revert "device-tests: As a dependency to tests"" am: 5b216025ba
am: 9c0b12db47

Change-Id: Iceb0d847f381ede8bf5f426452ca197bb1c86fb7
2017-03-21 01:09:59 +00:00
Jin Qian
9c0b12db47 Merge "Revert "device-tests: As a dependency to tests""
am: 5b216025ba

Change-Id: I6305f1e4cb12d7af27a897812fe68934b1dc884b
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.

Change-Id: Ib439e2351da6c5eabcf412b29c6d798d05e01612
2017-03-21 01:00:41 +00:00
Dan Willemsen
6be7d01e05 Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a am: 35bdbdfdc3
am: 0a5905c139

Change-Id: I74719ac53bd7c477c71e3680657139d7dfa9db5c
2017-03-20 23:21:22 +00:00
Dan Willemsen
0a5905c139 Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a
am: 35bdbdfdc3

Change-Id: I6192fdd7cc02a3dea8ede2e98de3df8c51cdd7cb
2017-03-20 23:18:51 +00:00
Dan Willemsen
35bdbdfdc3 Merge "Remove USE_SOONG_UI=false"
am: ebf57f6f0a

Change-Id: Ieba4905ed40fd167d58978ca628998f402cd3658
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

Change-Id: Iac1df2a2ff37bb239c1bba026d62c1cb9022d8b8
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

Change-Id: I5658cb477b801a9322e647a507d0d3de8f9d67c7
2017-03-20 23:03:52 +00:00
Dan Willemsen
21f7aa5b2c Merge "Use built module instead of installed module for profman"
am: 46eeb0580c

Change-Id: I2d264e0ab38b495111babaafa765d23dff60f9f7
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

Change-Id: I15832d0b20788df5374930dc1b09fe0ec9ac3122
2017-03-20 22:28:51 +00:00
Simran Basi
e3567c4847 Merge "device-tests: As a dependency to tests" am: 26594fce3f
am: 318840dfb6

Change-Id: Idde1b5217db2737a9ff57c56b40db7340dd9e776
2017-03-20 22:25:48 +00:00
TreeHugger Robot
616966821c Merge "Add clear key CAS plugin (libclearkeycasplugin.so) to build." 2017-03-20 22:25:47 +00:00
Simran Basi
318840dfb6 Merge "device-tests: As a dependency to tests"
am: 26594fce3f

Change-Id: I657421f3379637084e4b1d51187d733e4c9a0cca
2017-03-20 22:21:48 +00:00
Treehugger Robot
26594fce3f Merge "device-tests: As a dependency to tests" 2017-03-20 22:15:34 +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
Diego Wilson
bc372ec3ec Add libdynamic_sensor_ext to aosp_arm64_ab
This library was added as a dependency of the
sensors HAL.

Test: build and load aosp_arm64_ab on sailfish and marlin.
Change-Id: Iaa413d3572ec12e1f022539a5ade1f3c2d793999
2017-03-20 13:02:53 -07:00
Diego Wilson
a2d55b58d8 Move device specific properties to /vendor
By setting BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED on aosp_arm64_ab
the device specific properties like ro.product.board
are hosted in /vendor/build.prop.

Test: build and flash aosp_arm64_ab system.img on sailfish and marlin.
Change-Id: I8062ff81221a3026626736b012ceaf99d8ca2d12
2017-03-20 13:02:53 -07:00
Dan Willemsen
402a0aea77 Merge "Revert "install *.so in different paths for their types"" am: 8311d46c86 am: 7195fb8920
am: 235042e404

Change-Id: Ic898d748ad303e5b09321a6ee2f21267ecc3731e
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

Change-Id: I65cffef58f079c7c68690f370644a9049c821779
2017-03-17 22:57:23 +00:00
Dan Willemsen
7195fb8920 Merge "Revert "install *.so in different paths for their types""
am: 8311d46c86

Change-Id: I330c5b3014dd331dc2f7369ac635b3de2ee54aca
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

Change-Id: I1bdfa6a248cfb58abfc59970c82c466595c2d91e
2017-03-17 17:56:51 +00:00
Simran Basi
38c95e4d6d Merge "device-tests & general-tests: build out zips." am: dd908dd925
am: 0aa305aacc

Change-Id: I7c45274e789d1722c333b1dcfa2be50c1cd685fc
2017-03-17 17:53:20 +00:00
Simran Basi
0aa305aacc Merge "device-tests & general-tests: build out zips."
am: dd908dd925

Change-Id: If51d656f068fac56cc8ebf2e0a25235ccc97cdd7
2017-03-17 17:50:23 +00:00