Commit graph

46759 commits

Author SHA1 Message Date
Paul Duffin
cb846fa6f8 Revert "Build: Do not treat org.apache.http.legacy.boot as boot classpath"
This reverts commit 039bb48f72.

This is no longer needed. Depending on the setting of REMOVE_OAHL_FROM_BCP the org.apache.http.legacy library is now either on the bootclasspath or a standalone library, it cannot be both.

Bug: 18027885
Bug: 72167111
Change-Id: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Merged-In: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Test: make with and without REMOVE_OAHL_FROM_BCP=true
(cherry picked from commit 9390268746)
2018-10-09 21:19:25 -07:00
Colin Cross
4e04fff35e Merge "Remove extra JNI libs from prebuilt APKs"
am: 0443b46066

Change-Id: I5e0a657afcc61f7d7a7d19c2321b0654901274ca
2018-10-09 16:19:31 -07:00
Colin Cross
9cda85eb94 Merge "Add support for JNI libraries to soong_app_prebuilt.mk"
am: 9cb5cfad6d

Change-Id: I6ddadaf1b6e2445d9cf64316e9f2fa9cecf4a6e5
2018-10-09 15:52:12 -07:00
Treehugger Robot
0443b46066 Merge "Remove extra JNI libs from prebuilt APKs" 2018-10-09 22:35:26 +00:00
Treehugger Robot
9cb5cfad6d Merge "Add support for JNI libraries to soong_app_prebuilt.mk" 2018-10-09 21:50:40 +00:00
Colin Cross
0e8a2ee172 Remove extra JNI libs from prebuilt APKs
If an APK specifies LOCAL_PREBUILT_JNI_LIBS embedded in the prebuilt
APK, remove any that aren't listed.  Restores the behavior from before
I82dd3aa441712772a1d1ddd6aaf5f41179facaa7.

Bug: 69500920
Test: m checkbuild
Change-Id: I971a9c4206604c172d77144df4c0ed9a8b1c5dd0
2018-10-09 13:06:01 -07:00
Andreas Gampe
aa7650648f Merge "Change install paths of libs in sanitize builds"
am: 10b28befbe

Change-Id: I24ee93f44f9932d90e85d95bdedbdf1ecfddae29
2018-10-09 11:25:11 -07:00
Andreas Gampe
10b28befbe Merge "Change install paths of libs in sanitize builds" 2018-10-09 18:14:20 +00:00
Tom Cherry
16f45d6cd9 Whitelist TARGET_COPY_OUT_RAMDISK for mainline
Test: mainline builds without BOARD_BUILD_SYSTEM_ROOT_IMAGE set.
Change-Id: Ia3a5bfa6d2ba1872710409d8c88bba6ff710a1c6
2018-10-09 10:41:01 -07:00
Vladimir Marko
a332207767 Prebuild: Remove --compile-pic and -Xnorelocate.
The --compile-pic argument is obsolete, all generated code
is now PIC.

The -Xnorelocate is ignored by dex2oat since
    https://android-review.googlesource.com/771001
where the option was reinterpreted from "use patchoat if
needed" to "relocate the boot image in memory if possible"
and dex2oat forbids that relocation.

Test: Pixel 2 XL boots.
Bug: 77856493
Change-Id: I60cdf81267a129be8a482af26fb865110561268e
2018-10-09 17:35:07 +01:00
nelsonli
f52da96e11 Merge "Build System: Ignore copies in copy-many-files if src == dst"
am: 5112afe657

Change-Id: I48764170916be8ff5be985c16457ba3f09ce40d2
2018-10-09 03:34:12 -07:00
Treehugger Robot
5112afe657 Merge "Build System: Ignore copies in copy-many-files if src == dst" 2018-10-09 10:25:22 +00:00
Kevin Cheng
9db85cd422 Merge "Add acloud shortcut in envsetup.sh"
am: e58de93cdb

Change-Id: Ie1c9b450263a7a02cd5f27cd0868fc3abae27da9
2018-10-09 01:19:08 -07:00
Treehugger Robot
e58de93cdb Merge "Add acloud shortcut in envsetup.sh" 2018-10-09 08:09:44 +00:00
nelsonli
c91284dcd8 Build System: Ignore copies in copy-many-files if src == dst
BUG: 117224272

Test: 1. Modify build/core/base_rules.mk
         Add the following line after line 617
	  $(eval my_compat_dist_$(suite) += out/a:out/a))
      2. touch out/a
      3. make -j BluetoothInstrumentationTests
      4. It should build pass without any dependency errors.

Change-Id: I40372eab5b74e042f605c3cb38e72942531ed69a
2018-10-09 14:46:40 +08:00
Elliott Hughes
54045b181c Merge "Move zipalign off NO_ERROR."
am: 3f7223984c

Change-Id: I37e953bd989d5f04b42129eef876c1aff4d162fb
2018-10-08 19:14:58 -07:00
Treehugger Robot
3f7223984c Merge "Move zipalign off NO_ERROR." 2018-10-09 02:00:27 +00:00
Colin Cross
ce594b4549 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs"
am: 0ab356ac20

Change-Id: Ia399045bb814afb3cea77af4d029f461b945aef7
2018-10-08 17:38:27 -07:00
Colin Cross
0ab356ac20 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs" 2018-10-09 00:29:14 +00:00
Kevin Cheng
bf89aff251 Add acloud shortcut in envsetup.sh
Bug: None
Test: source envsetup.sh and ran acloud successfully.
Change-Id: Ie75c2a6ea002fe3d909afd1760f4ab05c7c94a26
2018-10-08 16:23:40 -07:00
Colin Cross
808af69564 Merge "Don't zip hiddenapi output jar into jar"
am: f05a023a5a

Change-Id: I11a335aaa98477fd3da9b1608d5ac83b45dafa87
2018-10-08 15:10:06 -07:00
Dan Willemsen
a7557afd71 Merge "Update for flags passed from Soong"
am: 159693a3e5

Change-Id: I5546acc1b6b88488a4bd088d106feea852c8026d
2018-10-08 15:05:55 -07:00
Colin Cross
f05a023a5a Merge "Don't zip hiddenapi output jar into jar" 2018-10-08 22:04:59 +00:00
Dan Willemsen
159693a3e5 Merge "Update for flags passed from Soong" 2018-10-08 21:34:46 +00:00
Igor Murashkin
270f1b5897 Merge "base_system: Add iorapd as core product target"
am: 976f1d4577

Change-Id: I4664a8d004e0e100350fa80de532a7a6ed54d6e6
2018-10-08 13:19:21 -07:00
Treehugger Robot
976f1d4577 Merge "base_system: Add iorapd as core product target" 2018-10-08 20:12:59 +00:00
Colin Cross
dac94fff8f Use zip2zip for uncompress-dexs and uncompress-shared-libs
Unzipping and rezipping files causes the umask of the host machine
to affect the permissions in the APK.  Use the new zip2zip -0 feature
to rewrite the zip file with selected files uncompressed.

Bug: 69500920
Test: m checkbuild
Change-Id: I82dd3aa441712772a1d1ddd6aaf5f41179facaa7
2018-10-08 12:49:11 -07:00
Colin Cross
c3c62fba96 Don't zip hiddenapi output jar into jar
Zip classes*.dex so that the jar does not contain an empty
classes.jar.

Test: m out/target/common/obj/JAVA_LIBRARIES/android.test.base.impl_intermediates/javalib.jar
Change-Id: I53bdd2035b2963dd781734da64058c95e1cff9d4
2018-10-08 11:23:59 -07:00
Elliott Hughes
ad7d562d27 Move zipalign off NO_ERROR.
I really only care about code that's built for Windows, but I may as
well clean up anywhere that's easy to clean up too...

Bug: N/A
Test: builds
Change-Id: I3ef34fb12ac90e9411b6421e9c23dd8524f056ae
2018-10-08 11:19:28 -07:00
Dan Willemsen
7a5c5d730f Update for flags passed from Soong
Obsolete more GCC-specific flags, TARGET_(arm|thumb)_CFLAGS now contains
pre-filtered clang flags, and GLOBAL_CLANG_CFLAGS_NO_OVERRIDE now
contains all flags instead of just the clang additional flags.

Test: m
Change-Id: I068f155041e681068d38e1a5b6b04d354b85ccee
2018-10-07 19:43:23 -07:00
patricktu
3773dc822d Merge "aidegen: Collect all java sources from makefile system."
am: c18b2b28c2

Change-Id: I23f6091ee0df91f274394ecb34ecb002451514d1
2018-10-05 19:24:26 -07:00
Treehugger Robot
c18b2b28c2 Merge "aidegen: Collect all java sources from makefile system." 2018-10-06 02:14:54 +00:00
Igor Murashkin
962e2dde0a base_system: Add iorapd as core product target
This makes iorapd be built as part of the system image
with a regular 'make' command.

Part of a topic that has 'iorapd' start up by init_rc.

Bug: 72170747
Change-Id: I300bc35f508fbe36bf0f545e20236c718392d571
2018-10-05 16:28:12 -07:00
patricktu
b23d8e6502 aidegen: Collect all java sources from makefile system.
Bug: 117129969
Test: make -j64 out/target/product/generic_x86_64/module-info.json
Change-Id: I4bc6cab8e56a1ed6485ad2f5f22fe9b8149b25d0
2018-10-05 14:55:36 +08:00
Tao Bao
45cd372ba9 Merge "releasetools: Set default stdout and stderr in common.Run()."
am: d124240719

Change-Id: I2fa5d13fddfacaa240b5c850cd667cfc489c2825
2018-10-04 20:20:35 -07:00
Tao Bao
d124240719 Merge "releasetools: Set default stdout and stderr in common.Run()." 2018-10-05 03:03:56 +00:00
Tao Bao
73dd4f45f3 releasetools: Set default stdout and stderr in common.Run().
stdout and stderr will default to subprocess.PIPE and subprocess.STDOUT
respectively (which is the expected behavior from most of the existing
callers), unless caller specifies any of them.

Test: `m dist`
Test: python -m unittest \
          test_common \
          test_add_img_to_target_files \
          test_ota_from_target_files \
          test_validate_target_files
Change-Id: I43b3f08edfa8a9bcfe54baf9848dc705c048e327
2018-10-04 17:05:09 -07:00
Yifan Hong
ecb1717422 Merge "Support "updatable groups"."
am: 3f0d1ad451

Change-Id: I704c56ff836e88f3a6c45a6869c9c111591860bc
2018-10-04 15:44:16 -07:00
Yifan Hong
3f0d1ad451 Merge "Support "updatable groups"." 2018-10-04 22:21:57 +00:00
Yifan Hong
b43012f0ad Support "updatable groups".
* BOARD_SUPER_PARTITION_GROUPS defines a list of "updatable groups". Each
updatable group is a group of partitions that share the same pool of free
spaces.

* For each group in BOARD_SUPER_PARTITION_GROUPS, a BOARD_{GROUP}_SIZE and
BOARD_{GROUP}_PARTITION_PARTITION_LIST may be defined.
    - BOARD_{GROUP}_SIZE: The maximum sum of sizes of all
      partitions in the group.
      If empty, no limit is enforced on the sum of sizes for this group.
    - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that
      belongs to this group.
      If empty, no partitions belong to this group, and the sum of sizes is
      effectively 0.

* BOARD_SUPER_PARTITION_PARTITION_LIST should not be defined
by the device. It is now computed from all
BOARD_{GROUP}_PARTITION_PARTITION_LIST.

* Each 'updatable group' has its own pool of space for its
partitions to grow into. Enforce the following:
    * sum(all partitions) <= super partition (/ 2 for A/B)
    * For each group, sum(partitions in group) <= group size
    * sum(all group sizes) <= super partition (/ 2 for A/B)

Test: builds
Bug: 111610495
Change-Id: I072b011714ec31a1d8813cc75edd27da3c6ff39a
Merged-In: I072b011714ec31a1d8813cc75edd27da3c6ff39a
2018-10-04 13:08:56 -07:00
David Anderson
df6037fbf7 Merge "Remove uuidgen.py and update lpmake parameters."
am: d1428e2748

Change-Id: I3845a3818612d777e4a9ae95c2efddcb88233efd
2018-10-04 11:56:44 -07:00
Colin Cross
0fa751ba68 Add support for JNI libraries to soong_app_prebuilt.mk
Use install_jni_libs_internal.mk to install JNI libraries alongside
preinstalled APKs.  APKs with embedded JNI libraries are handled
within Soong.

Bug: 80095087
Test: m checkbuild
Change-Id: I2ecf10b6771dff14c940cc6e6442eb2ae43a75b0
2018-10-04 11:24:15 -07:00
David Anderson
d1428e2748 Merge "Remove uuidgen.py and update lpmake parameters." 2018-10-04 18:20:47 +00:00
Tao Bao
589952772f Merge "releasetools: build_image.BuildVerityTree() returns a tuple."
am: 4d36fcba8c

Change-Id: Iad62f594459c73aa67bff3ad15e07e48226f300f
2018-10-04 07:41:01 -07:00
Tao Bao
4d36fcba8c Merge "releasetools: build_image.BuildVerityTree() returns a tuple." 2018-10-04 14:35:26 +00:00
Anton Hansson
21e7c05f7e Merge "Move a few more string functions to strings.mk"
am: d6e5cb1add

Change-Id: I20cf6bbef1c3aa05ea034ddd52e16fe2a9e87b1a
2018-10-04 07:03:28 -07:00
Anton Hansson
d6e5cb1add Merge "Move a few more string functions to strings.mk" 2018-10-04 13:47:55 +00:00
Bowgo Tsai
aba6c98fd2 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""
am: 3e795ee38b

Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
2018-10-03 23:52:22 -07:00
Treehugger Robot
3e795ee38b Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" 2018-10-04 06:37:38 +00:00
Jim Tang
845a588927 Merge "Envsetup: Fix lunch choice with number in zsh"
am: 2647067ae9

Change-Id: Idf0dd8b06d00be9c5087c34b1887dcfdbee70673
2018-10-03 22:34:54 -07:00