openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
34,299 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

34299 Commits

Author SHA1 Message Date
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 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
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
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 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 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 e3567c4847 Merge "device-tests: As a dependency to tests" am: 26594fce3f 
am: 318840dfb6

Change-Id: Idde1b5217db2737a9ff57c56b40db7340dd9e776
 2017-03-20 22:25:48 +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
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 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
Treehugger Robot dd908dd925 Merge "device-tests & general-tests: build out zips." 2017-03-17 17:45:05 +00:00
bohu 4e0937222d Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1 
am: 5c8080cc18

Change-Id: I594e895cd1170501227ac030e07981a49c4a3aee
 2017-03-17 16:34:32 +00:00
bohu 5c8080cc18 Merge "Emulator: Enable logcat -Q to run in emulator" 
am: 406d3b6df1

Change-Id: I9f429980942e043ea874ad45bb88646d1c036f5b
 2017-03-17 16:30:33 +00:00
Treehugger Robot 406d3b6df1 Merge "Emulator: Enable logcat -Q to run in emulator" 2017-03-17 16:23:54 +00:00
Dan Willemsen de4e71b27b Revert "install *.so in different paths for their types" 
This reverts commit 842a985f90. It's
causing test failures, warnings and complaints, so backing it out and
we'll resolve those before putting it back in.

This also bundles in the revert of a minor warning/error fixup for this
code, and does the correct thing with the CleanSpec.mk (which can't just
be reverted).

Bug: 33681361
Test: m -j
Change-Id: Ic889ce6a4737a497ad6bf633424ce1860713f7d0
 2017-03-16 16:54:40 -07:00
Tao Bao 9db79477d5 releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 am: 839cdc66b1 
am: 4b066f1dcc  -s ours

Change-Id: Ibb801d9c5171fc3aef3e2a0f3a046c636f69b356
 2017-03-16 23:43:45 +00:00
Tao Bao 4b066f1dcc releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 am: d5de271e01 
am: 839cdc66b1

Change-Id: Ibbe218523096ec9c783ea4062a0cce0208851f95
 2017-03-16 23:33:44 +00:00
Tao Bao 839cdc66b1 releasetools: Add support for --override_timestamp. am: 9f884e6c55 am: 9ee7071553 
am: d5de271e01

Change-Id: Ibb5be92d09cb02181ec92d939f5851d26f1df345
 2017-03-16 23:26:44 +00:00
Tao Bao d5de271e01 releasetools: Add support for --override_timestamp. am: 9f884e6c55 
am: 9ee7071553

Change-Id: I58f6108d8d620d39d673e2be9489cb13b50fbbb0
 2017-03-16 23:24:13 +00:00
Tao Bao 9ee7071553 releasetools: Add support for --override_timestamp. 
am: 9f884e6c55

Change-Id: Ie17ff6bffa91d16bbb4a3de123fc8aa97a35d266
 2017-03-16 23:21:13 +00:00
Tao Bao 84161e9820 Merge "releasetools: Remove a dead line." am: 83a6b953c9 
am: 9a7201408f

Change-Id: If558390d4687bd918b57bcbdc2bf658105a0dd12
 2017-03-16 22:39:09 +00:00
Tao Bao 9a7201408f Merge "releasetools: Remove a dead line." 
am: 83a6b953c9

Change-Id: Ia61bcd76b28c959895f3318ffafbc980028345fc
 2017-03-16 22:32:40 +00:00
Tao Bao 83a6b953c9 Merge "releasetools: Remove a dead line." 2017-03-16 22:24:25 +00:00
Tao Bao 2f80e83e98 releasetools: Remove a dead line. 
system_root_image has been dead since commit
2ce63edab7.

Test: pylint --rcfile=pylintrc add_img_to_target_files.py
Change-Id: Id791747b7313923b82279a21d264a998455a92d4
 2017-03-16 11:59:24 -07:00
Tianjie Xu a9453d915d Merge "Provide more info for bsdiff/imgdiff exceptions." am: 53ba93d615 
am: e742de1c4a

Change-Id: I8a649f67e648f57e23cae786a9dc4ab700822296
 2017-03-16 18:54:55 +00:00
Tianjie Xu e742de1c4a Merge "Provide more info for bsdiff/imgdiff exceptions." 
am: 53ba93d615

Change-Id: I40938a55c1a3f1f6a0d9ad2f2824c48fafab953c
 2017-03-16 18:46:24 +00:00
Tianjie Xu 53ba93d615 Merge "Provide more info for bsdiff/imgdiff exceptions." 2017-03-16 18:43:28 +00:00
Tao Bao 3ebe86b6a8 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 am: 00f2147e70 
am: aaabaf74d6  -s ours

Change-Id: I08b98aed29b97c015df4d6229fee7e8b0dd9f8b3
 2017-03-16 18:38:23 +00:00
Tao Bao aaabaf74d6 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 am: a7dcbfb2d8 
am: 00f2147e70

Change-Id: Ic7b779c390f9611d31d644b0dbf0914521a479ca
 2017-03-16 18:35:24 +00:00
Tao Bao 00f2147e70 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6 
am: a7dcbfb2d8

Change-Id: I1958c8e75f83812ed493221fdf2fb74ee406becb
 2017-03-16 18:30:53 +00:00