Commit graph

34038 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Miao Wang
45976ab0c9 Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition."
am: 3fd80635af

Change-Id: Id6c164577684e0ed03e8ff1adf29d4648cf31f6c
2017-03-16 06:49:54 +00:00
Treehugger Robot
3fd80635af Merge "Add TARGET_OUT_VENDOR_RENDERSCRIPT_BITCODE definition." 2017-03-16 06:45:48 +00:00
Jiyong Park
42fc6363a6 Merge "Silence module path warnings for a while"
am: d5c3d1366f

Change-Id: I9bc012f72dd347b725c1104c22eb84940966df5c
2017-03-16 05:54:32 +00:00
Treehugger Robot
d5c3d1366f Merge "Silence module path warnings for a while" 2017-03-16 05:49:25 +00:00
bohu
8c3364bd59 Emulator: Enable logcat -Q to run in emulator
Create qemu_cmdline property and make sure logcat
can read it.

Change-Id: I83261a1ba29ecf9fd9b51a815425742177018c87
2017-03-15 22:27:08 -07:00
Jiyong Park
79f5918199 Silence module path warnings for a while
Warning messages like, "libart_fake: framework library must be installed
to system/lib64 but requested to be installed at system/fake-libs64.
Please fix.", are temporarily muted since some of those warnings might
be false alarms.

Let's just silence the warning for everybody and investigate the cases
internally by turning on the build flag SHOW_MODULE_PATH_WARNINGS.

Test: the warning messages should not be shown unless built with
SHOW_MODULE_PATH_WARNINGS=true.

Change-Id: I5eb3ab3385c92a5192723ff1008277c321162191
2017-03-16 12:57:21 +09:00
Simran Basi
c8f21f6c4e device-tests & general-tests: build out zips.
Generates the output zips of the device-tests & general-tests
buildable suites.

Bug: 35386840
Test: make dist device-tests general-tests -j
Change-Id: I253bcd8615379334b52b4d770a5c4f7e07a58795
2017-03-15 17:56:50 -07:00
Alex Klyubin
ac5ac23bb3 Merge "Remove unused /selinux_version"
am: f32107fbb2

Change-Id: Iba4f3d7eca37bbf20d9527245baf44f32b67c07f
2017-03-15 20:05:15 +00:00
Treehugger Robot
f32107fbb2 Merge "Remove unused /selinux_version" 2017-03-15 19:59:03 +00:00
Colin Cross
2afade582d resolve merge conflicts of da00e137ec to stage-aosp-master
Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90
2017-03-15 10:20:24 -07:00
Treehugger Robot
da00e137ec Merge "Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME" 2017-03-15 17:04:58 +00:00
Alex Klyubin
4fe461d2a0 Remove unused /selinux_version
This file is no longer needed because it was needed for supporting
reloadable/dynamic SELinux policy which is no longer supported.

Test: Clean build, flash, device boots without additional denials.
      Reboot to recovery works, no additional denials.
Bug: 33642277
Change-Id: Ie65e74b8c8437694bc1ea019ab844f60f9e89ade
2017-03-15 09:47:36 -07:00
Colin Cross
8843039368 Merge "package-modules: use && instead of ; between copy commands"
am: e0e20079c2

Change-Id: I5984eeac0581b8fdd5ae6186291cce02f430e450
2017-03-15 02:18:40 +00:00
Colin Cross
e0e20079c2 Merge "package-modules: use && instead of ; between copy commands" 2017-03-15 02:09:20 +00:00
Tianjie Xu
b59c17fc8f Provide more info for bsdiff/imgdiff exceptions.
When bsdiff/imgdiff fails, dump the output along with the src/tgt
filenames and block ranges. Also, exit the script gracefully instead
of raising an exception about iterating over 'NoneType'.

Bug: 31381530
Test: Package generates successfully for angler, and error outputs
      correctly with error injection.

Change-Id: I06a2dfe545fbdff7043de05fee34b378453a9291
2017-03-14 18:51:21 -07:00
Colin Cross
b3bfc7172b Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME from
TARGET_PLATFORM_VERSION.  Add explicit values for O, even though
they are the same as the fall backs, as placeholders for future
values.

Bug: 35445510
Test: manual
Merged-In: I30a7142f732c85b637d2ce072373bc867cedcd42
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
2017-03-15 01:10:28 +00:00
Colin Cross
f075bcbc98 package-modules: use && instead of ; between copy commands
Using ; to join commands in a rule causes failures to be ignored by
make.  Use && instead, and add true at the end as the second operand
to the last && operator.

Also inline copy-test-in-batch, batching is no longer necessary as
kati will fall back to a shell script if the recipe is too long to
fit in a command line.

Test: builds
Change-Id: I4a2528bf2a15106cfabaae0336662c4a0464271d
2017-03-14 16:58:34 -07:00
Alex Klyubin
47b3e3d92e Merge "Add /file_contexts.bin only to devices which need it"
am: 77dab1ed35

Change-Id: Ic290b4c919b28bd9110f0f7fd782a564beb53ca0
2017-03-14 14:47:24 +00:00
Treehugger Robot
77dab1ed35 Merge "Add /file_contexts.bin only to devices which need it" 2017-03-14 14:41:31 +00:00
Jaesoo Lee
371f5d502c Merge "configstore: add default implementation of configstore@1.0 HAL"
am: 2b61f19254

Change-Id: Ie122892697d2073575fcbb7dae4ba9838778517e
2017-03-14 06:50:30 +00:00
Jaesoo Lee
2b61f19254 Merge "configstore: add default implementation of configstore@1.0 HAL" 2017-03-14 06:44:13 +00:00
Jiyong Park
0871e0029f Merge "fix: cannot determine the type of modules with class 'samples'"
am: b1331938a3

Change-Id: I2908df25418d37f4be1c653110233900a063af8c
2017-03-14 02:21:43 +00:00
Treehugger Robot
b1331938a3 Merge "fix: cannot determine the type of modules with class 'samples'" 2017-03-14 02:14:59 +00:00