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

43665 Commits

Author SHA1 Message Date
Colin Cross a9aa74ca38 Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ... am: 34af6a41ff 
am: 3d8c0a2c9e

Change-Id: I310c37dd5ef95e94f64630194c9aed1effa4818e
 2018-03-14 23:48:21 +00:00
Colin Cross 3d8c0a2c9e Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ... 
am: 34af6a41ff

Change-Id: I90487b3fed921af1571d1e87491a92e08fdd8050
 2018-03-14 23:42:45 +00:00
Colin Cross 34af6a41ff Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ... 
* changes:
  Allow aapt2 rules to take zipped resource files
  Add LOCAL_SRCJARS support
  Remove unused .fs file suppport
  Remove unused file lists
  Remove sharding support from make
  Move aapt flags from java_common.mk to aapt_flags.mk
 2018-03-14 23:29:49 +00:00
Adam Seaton 1be58ef810 Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev am: 3bdafad5b0 -s ours 
am: bb4986c6ce

Change-Id: I39be7bf84d8ea15f7cf889b68f63a021a9563af5
 2018-03-14 22:30:26 +00:00
Adam Seaton bb4986c6ce Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev 
am: 3bdafad5b0  -s ours

Change-Id: I1cfcb20c43ded9ec84a1343de5ce5bd5992281f6
 2018-03-14 22:16:05 +00:00
Adam Lesinski 0d94f49880 Merge "Enable apps to build with resource namespaces" am: d3547d9d5b 
am: 9600655fac  -s ours

Change-Id: Ic7285ba9db8f7d875f2123f56ba2e631074746de
 2018-03-14 22:08:59 +00:00
Adam Lesinski 9600655fac Merge "Enable apps to build with resource namespaces" 
am: d3547d9d5b

Change-Id: I52e7d6c6c805123e0e0815a52854e848ea473ffe
 2018-03-14 22:00:41 +00:00
TreeHugger Robot 3bdafad5b0 Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev 2018-03-14 21:58:27 +00:00
Colin Cross bc0c494d3a Allow aapt2 rules to take zipped resource files 
Allow aapt2 rules to take zipped resource files similar to the
way the javac rules take srcjars.  For now, unzip the files using
extract_srcjars.sh, and then use aapt2 compile --dir.  Eventually
it could be done with aapt2 compile --zip.

Bug: 73885582
Bug: 74574557
Test: m checkbuild
Change-Id: I97ea3ff305e7a9ef2a908b4cf0bca903af62c6b1
 2018-03-14 14:13:18 -07:00
Treehugger Robot d3547d9d5b Merge "Enable apps to build with resource namespaces" 2018-03-14 21:05:55 +00:00
Colin Cross 475475ca3a Merge "Allow locally disabling R8" am: 017a894c6e 
am: 391a95da7e

Change-Id: I3c0a0d0eef90b3c824cce9c2e350714c0d00761f
 2018-03-14 19:28:15 +00:00
Colin Cross 391a95da7e Merge "Allow locally disabling R8" 
am: 017a894c6e

Change-Id: I8eb9e5ffaf1ca0a5de56ad92acc27490cf76c984
 2018-03-14 19:21:09 +00:00
Colin Cross 017a894c6e Merge "Allow locally disabling R8" 2018-03-14 19:07:58 +00:00
Colin Cross 11e2d55c0f Add LOCAL_SRCJARS support 
Allow java modules to take jars containing .java files as an input.
For turbine, pass them directly to turbine.  For javac, extract them
to a directory and pass a list of the files to javac.

Bug: 73885582
Test: m checkbuild
Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
 2018-03-14 12:05:04 -07:00
Colin Cross 93d6550c53 Remove unused .fs file suppport 
.fs files are obsolete.

Bug: 73885582
Test: m checkbuild
Change-Id: I74b618099333fe565c7b235994be64e6466d2da6
 2018-03-14 12:05:01 -07:00
Colin Cross c3e7074df1 Remove unused file lists 
RS_FILES and AIDL_FILES were used for cleaning up the intermediate
src dir, but are no longer used after
If7529979de6fa62a651933a3a974f47b033851d6 and
I01feff7cc399ac5b88b83333a1ac86928d0a81e6.

Bug: 73885582
Test: m checkbuild
Change-Id: If2653f846b568fd2587c8e055ef820e17760f133
 2018-03-14 12:04:58 -07:00
Colin Cross 5ef6e79c21 Remove sharding support from make 
Sharding is not used in make any more, the large java modules
(libcore and framework) have moved to Soong.  Keeping sharding
support complicates java compiling, so remove it.

Bug: 73885582
Test: m checkbuild
Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
 2018-03-14 12:04:55 -07:00
Colin Cross b6013af085 Move aapt flags from java_common.mk to aapt_flags.mk 
The aapt flags were being set in java_common.mk, which is used by
various entry points.  host_dalvik_java_library.mk and
host_java_library.mk, and java_library.mk don't support aapt, only
package_internal.mk and static_java_library.mk do.  Move the aapt
flags into aapt_flags.mk, and include it from package_internal.mk
and static_java_library.mk.

Bug: 73885582
Test: no change to build-${TARGET_PRODUCT}.ninja
Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
 2018-03-14 12:04:35 -07:00
Adam Lesinski 960de8efcd Enable apps to build with resource namespaces 
Setting LOCAL_AAPT_NAMESPACES := true enables
namespaces for an app and requires any library resources
to be fully qualified by their package.

Test: manual
Bug: 73885582
Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
Merged-In: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
 2018-03-14 12:04:01 -07:00
Colin Cross 5c66c2864a Allow locally disabling R8 
Bug: 74746744
Test: m checkbuild
Change-Id: I5741f15821cf8de5df494ed8ad31d32a44657514
 2018-03-14 17:00:23 +00:00
Julien Desprez 4e6987f9e6 Merge "Update the base autogenerated config template for instru" am: edf8fc4e51 
am: f602e26e1d

Change-Id: If47ea726220844b32d4d56878f5a88d336745b52
 2018-03-14 14:26:11 +00:00
Julien Desprez f602e26e1d Merge "Update the base autogenerated config template for instru" 
am: edf8fc4e51

Change-Id: I8307be4b0acebdc910762073b756fa4e442bb415
 2018-03-14 14:19:35 +00:00
Julien Desprez edf8fc4e51 Merge "Update the base autogenerated config template for instru" 2018-03-14 14:03:42 +00:00
Martijn Coenen 16ab41d8ff Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev 
am: d027dfa39f

Change-Id: I259f69f1be9baeab32f45637a17f43dea3c1b728
 2018-03-14 11:17:17 +00:00
Martijn Coenen d027dfa39f Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev 2018-03-14 11:05:19 +00:00
Adam Seaton ffccb8967d [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 am: 98086a211c am: 47e4c77438 -s ours 
am: c30cc7d343

Change-Id: I7ee6c79fe27bed9fe93b071e19c57380ebe229a9
 2018-03-14 00:46:35 +00:00
Adam Seaton c30cc7d343 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 am: 98086a211c 
am: 47e4c77438  -s ours

Change-Id: I5b2bb6033ef974d93e5d092c5b50abc0babbfcf1
 2018-03-14 00:38:23 +00:00
Adam Seaton 47e4c77438 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 
am: 98086a211c

Change-Id: Icbb289c0edd5f754f1ae4b180376163e4c3f6879
 2018-03-14 00:33:23 +00:00
Adam Seaton 98086a211c [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f 
am: c3dd369446

Change-Id: If6822cab153c266841fc35fcfa2bb38a4ef4ab95
 2018-03-14 00:26:02 +00:00
jdesprez b8f85204a6 Update the base autogenerated config template for instru 
For APCT auto-generated configuration, the template will
include the test-suite-tag that will allow it to be
picked up automatically.

Test: none
Bug: 74440293
Change-Id: Ia82e8287f212f4daec97523394517bfbbe7a86d3
 2018-03-13 13:43:42 -07:00
Android Build Merger (Role) c3dd369446 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f 
Change-Id: Ib99dd412a286ea7ce26bf4cc7b3c74f85bf2d401
 2018-03-13 20:28:19 +00:00
Android Build Merger (Role) 262656a47f [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa 
Change-Id: Ia8a4c064fb9a75b18745d0634e20925424d66153
 2018-03-13 20:28:15 +00:00
Android Build Merger (Role) bc62637ffa [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 
Change-Id: If3c74fdc2e91e9fbda025a98d284d985511de428
 2018-03-13 20:28:12 +00:00
Android Build Merger (Role) 5a2c0096d5 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc 
Change-Id: I50d425d04ba922293f6cb6a8003af8ca46dc03d4
 2018-03-13 20:28:10 +00:00
Android Build Merger (Role) 21f45f7edc [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 
Change-Id: I3e1a3207a870268adb780b2355bcd53bb2a71467
 2018-03-13 20:28:07 +00:00
Adam Seaton 7c0f23dce5 [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 
bug: 74345861
 2018-03-13 13:27:02 -07:00
Adam Seaton cd85c0da4a DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05 
Bug: 74345861
Change-Id: I85a9878bfd441bc95242023f713b6848992bea06
 2018-03-13 13:04:40 -07:00
Adrian Roos f8fdd399fa Multi cutout: replace wide with double overlay 
am: 17444d16c2

Change-Id: I422c6a829f507245b4b180ec14129e9ed48afdd2
 2018-03-13 18:15:44 +00:00
Adrian Roos 17444d16c2 Multi cutout: replace wide with double overlay 
Bug: 74195186
Test: make droid
Change-Id: I4758ed081a0e306f87db21c9bc2c8160c455a0e6
 2018-03-13 13:45:23 +01:00
Justin Yun bf111719d3 Merge "Use default libnfc-nci.conf if not found in vendor/etc" am: 1988d976ec 
am: 46d5776509

Change-Id: I4da8b5acef9e086526c44ebc074d8efb3d456b4f
 2018-03-13 01:19:59 +00:00
Justin Yun 46d5776509 Merge "Use default libnfc-nci.conf if not found in vendor/etc" 
am: 1988d976ec

Change-Id: I729cd256adbf7681f4ed988d28427ed66025772e
 2018-03-13 01:09:22 +00:00
Treehugger Robot 1988d976ec Merge "Use default libnfc-nci.conf if not found in vendor/etc" 2018-03-13 00:51:04 +00:00
Mathieu Chartier ecc9f25a82 Merge changes I01d32749,If3540c3a am: c18ae710ae 
am: 8119b3812e  -s ours

Change-Id: Idaae9ff85f3b3d62921c73e453b80705418dc15c
 2018-03-13 00:07:59 +00:00
Mathieu Chartier 8119b3812e Merge changes I01d32749,If3540c3a 
am: c18ae710ae

Change-Id: I500778eb04c715647db6a27abc5ae3ae37ce79bf
 2018-03-13 00:03:09 +00:00
Mathieu Chartier c18ae710ae Merge changes I01d32749,If3540c3a 
* changes:
  Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""
  Revert "For user and userdebug generate error if DEXPREOPT is not enabled"
 2018-03-12 23:42:53 +00:00
Justin Yun 746684376a Use default libnfc-nci.conf if not found in vendor/etc 
If libnfc-nci.conf is not installed in vendor/etc, use default
configuration file in system/etc on GSI.

Bug: 72080121
Test: Install GSI and remove vendor/etc/libnfc-nci.conf.
      Check if nfc is available in settings menu.

Change-Id: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa
 2018-03-12 23:24:31 +00:00
Dan Willemsen 043098087d Merge "Remove obsolete BRILLO variable" am: a0c1cc97bd 
am: 55a5475ec2

Change-Id: I3cb12da7a6c9a86e9d7d1d9f77481b5cc2030d73
 2018-03-12 22:04:05 +00:00
Dan Willemsen 55a5475ec2 Merge "Remove obsolete BRILLO variable" 
am: a0c1cc97bd

Change-Id: Ifa9ec91b5d3c425c1f9ed8773ccf92f8183e3449
 2018-03-12 21:54:02 +00:00
Dan Willemsen a0c1cc97bd Merge "Remove obsolete BRILLO variable" 2018-03-12 21:26:03 +00:00
Mathieu Chartier 94b0a48c8b Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev 
am: 1a50e975ae

Change-Id: I73e643ebd7e9ad4d7a1fa8c2528cb0c692c9a97b
 2018-03-12 19:23:16 +00:00