OSDN Git Service
TreeHugger Robot [Wed, 25 Jan 2017 01:42:59 +0000 (01:42 +0000)]
Merge "Prevent abuse of property overrides"
Ray Essick [Wed, 25 Jan 2017 01:01:08 +0000 (01:01 +0000)]
Merge "change mediaanalytics to mediametrics"
Tao Bao [Wed, 25 Jan 2017 00:04:24 +0000 (00:04 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages." am:
41130f495f am:
62bc5301ec am:
ac5a36e56b
am:
56677596ff
Change-Id: Icfc372710ad90be02d1590149e079675e7f16774
Tao Bao [Wed, 25 Jan 2017 00:02:52 +0000 (00:02 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages." am:
41130f495f am:
62bc5301ec
am:
ac5a36e56b
Change-Id: I4589d78f4adc7ae9af3a77407cfee8a4f4b9c4e6
Tao Bao [Wed, 25 Jan 2017 00:00:54 +0000 (00:00 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages." am:
41130f495f
am:
62bc5301ec
Change-Id: I6b70d99f0e3d944852938a4e7fdcf34dcde06e07
Tao Bao [Tue, 24 Jan 2017 23:59:24 +0000 (23:59 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
am:
41130f495f
Change-Id: I33e4eb9cc536c7d49535a4c393a6b3303add9742
Tao Bao [Tue, 24 Jan 2017 23:55:52 +0000 (23:55 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:27:44 +0000 (22:27 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am:
131731fd49 am:
7254e730a9 am:
0e2a7399da
am:
d1a5cf176f
Change-Id: Id062e9704ee3be622089e6a36908509a5f883687
Calin Juravle [Tue, 24 Jan 2017 22:27:00 +0000 (22:27 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am:
eddf3adec7 am:
9be4363048 am:
79ff8975b6
am:
e674f92620
Change-Id: I7a891430c883e7e6f4b79c7daacb8b9ce58929bb
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am:
131731fd49 am:
7254e730a9
am:
0e2a7399da
Change-Id: I02955c2b729673771844f3e1c3b7099e7eb50d7b
Calin Juravle [Tue, 24 Jan 2017 22:23:32 +0000 (22:23 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am:
eddf3adec7 am:
9be4363048
am:
79ff8975b6
Change-Id: I18428fe7cfb49a70dcf55b77dd0d92d839acdf01
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:22:08 +0000 (22:22 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default." am:
131731fd49
am:
7254e730a9
Change-Id: If496e17ca32097e2b5c5d1b16097ba68f52c2587
Calin Juravle [Tue, 24 Jan 2017 22:21:28 +0000 (22:21 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am:
eddf3adec7
am:
9be4363048
Change-Id: I09bb657dfa3a3d5ca5a2410313ee061235f56c74
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:20:19 +0000 (22:20 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
am:
131731fd49
Change-Id: I434953132243db254adf8513240e33257b917b21
Calin Juravle [Tue, 24 Jan 2017 22:19:32 +0000 (22:19 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
am:
eddf3adec7
Change-Id: I3405653797259f6529e1fd4e10434a435a3365fd
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:14:43 +0000 (22:14 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
Calin Juravle [Tue, 24 Jan 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
Evgenii Stepanov [Tue, 24 Jan 2017 21:00:55 +0000 (21:00 +0000)]
Merge "Force Thumb for CFI targets." am:
34eb9f7f60 am:
9e8e3de9d8 am:
682a87a7f5
am:
999ea7f160
Change-Id: I84f7f7107c8166f93ffe3c47d2743b6c7e427e2f
Evgenii Stepanov [Tue, 24 Jan 2017 21:00:40 +0000 (21:00 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am:
96c81711c1 am:
e729e804fe am:
629002835a
am:
d79d664dc9
Change-Id: Ia2d4f0a4748f3e7964d384e58c386c8678f810c4
Evgenii Stepanov [Tue, 24 Jan 2017 20:58:55 +0000 (20:58 +0000)]
Merge "Force Thumb for CFI targets." am:
34eb9f7f60 am:
9e8e3de9d8
am:
682a87a7f5
Change-Id: I9a586f57a8988bdb8d772705acef8f5f8b967e8d
Evgenii Stepanov [Tue, 24 Jan 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am:
96c81711c1 am:
e729e804fe
am:
629002835a
Change-Id: Ia09b6fa057b4aada743d82ffcf5af87ab1b149f9
Evgenii Stepanov [Tue, 24 Jan 2017 20:56:54 +0000 (20:56 +0000)]
Merge "Force Thumb for CFI targets." am:
34eb9f7f60
am:
9e8e3de9d8
Change-Id: I4f997927ff4357799afe8ca5d78255ea4e563beb
Evgenii Stepanov [Tue, 24 Jan 2017 20:56:41 +0000 (20:56 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets." am:
96c81711c1
am:
e729e804fe
Change-Id: I8a20ce05dffbf33b7c3480e13ee40cf0257dc06a
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Force Thumb for CFI targets."
am:
34eb9f7f60
Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:42 +0000 (20:54 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
am:
96c81711c1
Change-Id: I914f2c1e037ad8988181801f7689636952beb5b2
Evgenii Stepanov [Tue, 24 Jan 2017 20:52:25 +0000 (20:52 +0000)]
Merge "Force Thumb for CFI targets."
Evgenii Stepanov [Tue, 24 Jan 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
Hiroshi Yamauchi [Tue, 24 Jan 2017 19:08:44 +0000 (11:08 -0800)]
Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug:
34084559
Bug:
34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
Jaekyun Seok [Fri, 20 Jan 2017 04:17:12 +0000 (13:17 +0900)]
Prevent abuse of property overrides
To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.
- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
files.
Test: building succeeded on marlin-userdebug.
Bug:
34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
Evgenii Stepanov [Tue, 24 Jan 2017 00:57:38 +0000 (16:57 -0800)]
Run $(AR) with LLVMgold.so plugin for CFI targets.
Bug:
34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1
Ray Essick [Mon, 23 Jan 2017 20:04:17 +0000 (12:04 -0800)]
change mediaanalytics to mediametrics
mediaanalytics has been renamed to mediametrics; set up
so that we build the new component name instead of the old one.
Bug:
34615027
Test: clean build, proper binary generated
Hiroshi Yamauchi [Mon, 23 Jan 2017 18:49:43 +0000 (10:49 -0800)]
Increase the generic_arm64 system image partition size to to 2G.
Bug:
34571380
Test: build sdk_google_phone_arm64.
Change-Id: I53c8980417bfac3651d71c13111a0c1dc0022d6c
Evgenii Stepanov [Fri, 20 Jan 2017 22:12:08 +0000 (14:12 -0800)]
Force Thumb for CFI targets.
Bug:
22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
Joshua Lang [Fri, 20 Jan 2017 21:33:59 +0000 (21:33 +0000)]
Merge changes from topic 'emu_audio_fixes'
* changes:
Add audio HIDL *-impl and -service libraries to product packages
Add default audio_submix module to sdk_base build
Switch video codec config xml to goldfish version
Adding goldfish_audio_legacy hal to emulator build
Switch emulator sdk build audio_conf to goldfish
Tao Bao [Wed, 11 Jan 2017 19:57:10 +0000 (11:57 -0800)]
releasetools: Generate streamable A/B OTA packages.
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.
We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.
payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.
Bug:
33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
entry in the metadata file.
Change-Id: I04504e834eb36e18876c5f5a5a09289ee05c6f9a
TreeHugger Robot [Fri, 20 Jan 2017 02:55:25 +0000 (02:55 +0000)]
Merge "Add framework sysconfig content to the build"
Joshua Lang [Fri, 20 Jan 2017 02:49:08 +0000 (18:49 -0800)]
Add audio HIDL *-impl and -service libraries to product packages
Test: check files on the device
BUG:
34470377
Change-Id: I397bb945b92caeff4255bfaca7deb2939a98ba59
Vishwath Mohan [Fri, 20 Jan 2017 02:06:16 +0000 (02:06 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207 am:
3ca34aeb7e am:
7baefbc0d4
am:
d458faeeac
Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb
Vishwath Mohan [Fri, 20 Jan 2017 02:06:09 +0000 (02:06 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615 am:
1bd8984ace am:
085a015abb
am:
5b30c115a4
Change-Id: I1d854bb525be09926890da631ecfe77a7fb3413c
Vishwath Mohan [Fri, 20 Jan 2017 01:56:14 +0000 (01:56 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207 am:
3ca34aeb7e
am:
7baefbc0d4
Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2
Vishwath Mohan [Fri, 20 Jan 2017 01:56:08 +0000 (01:56 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615 am:
1bd8984ace
am:
085a015abb
Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6
Vishwath Mohan [Fri, 20 Jan 2017 01:50:44 +0000 (01:50 +0000)]
Merge "Hide CFI behind a global flag." am:
2d7fb30207
am:
3ca34aeb7e
Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f
Vishwath Mohan [Fri, 20 Jan 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Hide CFI behind a global flag." am:
c0bf85a615
am:
1bd8984ace
Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad
Vishwath Mohan [Fri, 20 Jan 2017 01:45:43 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
2d7fb30207
Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
Vishwath Mohan [Fri, 20 Jan 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
c0bf85a615
Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Dan Willemsen [Fri, 20 Jan 2017 01:30:28 +0000 (01:30 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a am:
4f87826d23 am:
b7303cde95
am:
9a5562312c
Change-Id: Ib8eb51136c7755eb52e9f015b4798566ddd6f3e3
Dan Willemsen [Fri, 20 Jan 2017 01:20:08 +0000 (01:20 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a am:
4f87826d23
am:
b7303cde95
Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
Dan Willemsen [Fri, 20 Jan 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Support native test prebuilts for X86+ARM builds" am:
bf28f5933a
am:
4f87826d23
Change-Id: I918859e58ab5d753e8a9cc83fc8f2eab940acbb9
Dan Willemsen [Fri, 20 Jan 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
am:
bf28f5933a
Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
Treehugger Robot [Fri, 20 Jan 2017 00:59:41 +0000 (00:59 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
Christopher Tate [Fri, 13 Jan 2017 21:54:21 +0000 (13:54 -0800)]
Add framework sysconfig content to the build
Bug
30953212
Change-Id: I2f9f301a38c9d2e7214222f00a44f8ef23f36e6f
Vishwath Mohan [Thu, 19 Jan 2017 22:35:31 +0000 (14:35 -0800)]
Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.
Bug:
30227045
Bug:
22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
Joshua Lang [Wed, 2 Nov 2016 23:44:11 +0000 (16:44 -0700)]
Add default audio_submix module to sdk_base build
Bug:
32612452
Test: Build emu and check file copied
Change-Id: Iadfa4bbf56feabf1080b7b4bc1959d7152bfd1b2
Joshua Lang [Thu, 6 Oct 2016 00:43:38 +0000 (17:43 -0700)]
Switch video codec config xml to goldfish version
Need to have custom configuration for goldfish video codecs.
Bug:
31648354
Test: Build emu and check correct file copied
Change-Id: I30282bc3c4bdb0e88d98a76908bebb2939fd0d64
(cherry picked from commit
9d9cefd03e3f794d6a5aafb9ba2ec4c4d262c224)
Joshua Lang [Sat, 23 Jul 2016 01:26:56 +0000 (18:26 -0700)]
Adding goldfish_audio_legacy hal to emulator build
Test: Build emu and check file copied
Change-Id: Ib089f58d067905dc21ec32bca341b1c67046152b
(cherry picked from commit
3d65ad3e1e13a8099a78b2814e5cc1ae8ef5ace6)
(cherry picked from commit
a1675ce1ab1b58b0994a197ee2c6b81cc7bbf3dd)
Joshua Lang [Wed, 21 Sep 2016 23:26:12 +0000 (16:26 -0700)]
Switch emulator sdk build audio_conf to goldfish
Test: Build emu and check correct file copied
Change-Id: I553f8e5a024d51903e51c2ac9520d8d7b9f639af
(cherry picked from commit
c1378c053cbc111f7ac20c6aa3c0881ef84b7cba)
Colin Cross [Thu, 19 Jan 2017 06:56:22 +0000 (06:56 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa am:
d4aba70550 am:
ac15f41714
am:
239c78a5b3
Change-Id: Icbd643898cc9babb09090525aa7f0961cf9a04c9
Colin Cross [Thu, 19 Jan 2017 06:53:52 +0000 (06:53 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa am:
d4aba70550
am:
ac15f41714
Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05
Colin Cross [Thu, 19 Jan 2017 06:51:21 +0000 (06:51 +0000)]
Merge "Don't pass empty arguments to ninja" am:
f8acdc50fa
am:
d4aba70550
Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0
Colin Cross [Thu, 19 Jan 2017 06:48:21 +0000 (06:48 +0000)]
Merge "Don't pass empty arguments to ninja"
am:
f8acdc50fa
Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
Treehugger Robot [Thu, 19 Jan 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Don't pass empty arguments to ninja"
Colin Cross [Thu, 19 Jan 2017 05:12:28 +0000 (21:12 -0800)]
Don't pass empty arguments to ninja
Passing an empty argument in argv to ninja results in an error:
ninja: error: empty path
Don't add jarg to the argument list if it is empty.
Bug:
34392351
Test: m -j
Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
Vishwath Mohan [Thu, 19 Jan 2017 01:50:29 +0000 (17:50 -0800)]
Hide CFI behind a global flag.
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden behind a flag.
Bug:
30227045
Bug:
22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: If4508ba448bd4260020483f9c11ee849bb419713
Chris Tate [Thu, 19 Jan 2017 01:09:48 +0000 (01:09 +0000)]
Revert "Add framework sysconfig content to the build"
This reverts commit
d68045446f9573c28dcd578465f81bbd14b3e48d.
Change-Id: I86b3c0fbe3eaec915f7dcf92623382d77d008734
TreeHugger Robot [Thu, 19 Jan 2017 00:50:01 +0000 (00:50 +0000)]
Merge "emulator: fingerprint: switch to using fingerprint HIDL interface"
Colin Cross [Thu, 19 Jan 2017 00:48:43 +0000 (00:48 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359 am:
57de869060 am:
8b8c5d98f1
am:
054fe8dc8a
Change-Id: I7cb978ed0c7844c41793e80f581da287abccedc9
Josh Gao [Thu, 19 Jan 2017 00:41:16 +0000 (00:41 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb am:
7cf55a4581 am:
1df77bc0c7
am:
85d13bcb8e
Change-Id: Ifffa02acab8d00a6d400c78ef27e0583f36b80ea
Colin Cross [Thu, 19 Jan 2017 00:15:57 +0000 (00:15 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359 am:
57de869060
am:
8b8c5d98f1
Change-Id: I94f427a5830c5400c0ad96b73b59210ebb845d7b
Colin Cross [Thu, 19 Jan 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Convert -j to a reasonable parallelism for kati" am:
bb5c13d359
am:
57de869060
Change-Id: I7c115293cc3dc86b7354b60ddf23b1bf5181ed6e
Colin Cross [Thu, 19 Jan 2017 00:12:27 +0000 (00:12 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
am:
bb5c13d359
Change-Id: Id3c6a55e0d6feb91d928a01ffd0875b574a8e5fb
Treehugger Robot [Thu, 19 Jan 2017 00:08:39 +0000 (00:08 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
Josh Gao [Wed, 18 Jan 2017 23:55:26 +0000 (23:55 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb am:
7cf55a4581
am:
1df77bc0c7
Change-Id: I298e81531aa44a488ba1ff1e73148de83830fd9a
Josh Gao [Wed, 18 Jan 2017 23:42:40 +0000 (23:42 +0000)]
Merge "Add crash_dump and tombstoned products." am:
6651199eeb
am:
7cf55a4581
Change-Id: Icf8f7ec6d0a9a74fdad5c7b49c88a5ef71dedd3c
Josh Gao [Wed, 18 Jan 2017 23:16:55 +0000 (23:16 +0000)]
Merge "Add crash_dump and tombstoned products."
am:
6651199eeb
Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge "Add crash_dump and tombstoned products."
Colin Cross [Wed, 18 Jan 2017 22:38:20 +0000 (14:38 -0800)]
Convert -j to a reasonable parallelism for kati
When running makeparallel in non-ninja mode, which is used when running
kati with USE_GOMA=true, convert -j to a reasonable parallelism value
the same way ninja does.
Bug:
34392351
Test: make -C build/make/tools/makeparallel makeparallel_test
Change-Id: I9aee4dd2a3b0f2b1c2c10087be83f7b2b06f4368
TreeHugger Robot [Wed, 18 Jan 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Add framework sysconfig content to the build"
bohu [Wed, 18 Jan 2017 20:20:29 +0000 (12:20 -0800)]
emulator: fingerprint: switch to using fingerprint HIDL interface
BUG:
34387576
Change-Id: Ia203ee1540f5c7c80e17d7a17abd3ce126579551
Nimrod Gileadi [Wed, 18 Jan 2017 19:01:10 +0000 (19:01 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f am:
b3aa218921
am:
e33294ec98
Change-Id: Id917a99d3f47deb1300c5375a891a8d83d354313
Nimrod Gileadi [Wed, 18 Jan 2017 18:59:25 +0000 (18:59 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52 am:
a5b069e38b
am:
0ec86c4602
Change-Id: I3363395b812cbd1d199dc6c90fc184b1fff1cfe4
Jorim Jaggi [Wed, 18 Jan 2017 18:56:42 +0000 (18:56 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47 am:
27b7101c6c am:
4f34f3d6f0
am:
89abe45160
Change-Id: Iedf9db6623a5214baa59e1be9ef5d7dfe6591db5
Jorim Jaggi [Wed, 18 Jan 2017 18:56:27 +0000 (18:56 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748 am:
b909e2c1aa am:
82968395c1
am:
a82a67145f
Change-Id: I735361d5facbe6a5cf1ffe4a61d5aecfa7b4f3db
Nimrod Gileadi [Wed, 18 Jan 2017 18:22:53 +0000 (18:22 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f
am:
b3aa218921
Change-Id: I7a3065d225439958f0454e0a0e2c761a2c5262ab
Nimrod Gileadi [Wed, 18 Jan 2017 18:21:07 +0000 (18:21 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52
am:
a5b069e38b
Change-Id: I2b65b68e4e6aa8705fe0782becb2c26bc2da36d1
Jorim Jaggi [Wed, 18 Jan 2017 18:18:56 +0000 (18:18 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47 am:
27b7101c6c
am:
4f34f3d6f0
Change-Id: Ied71fc8b2771ba2383723f83554abb8153c1d9ec
Jorim Jaggi [Wed, 18 Jan 2017 18:18:46 +0000 (18:18 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748 am:
b909e2c1aa
am:
82968395c1
Change-Id: I5b5d6bd944b4aed152aebaed7e3758cbcbfb0411
Nimrod Gileadi [Wed, 18 Jan 2017 17:06:58 +0000 (17:06 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f am:
d70bbef6bc
am:
ed2000f147
Change-Id: Ibf4773a1689852ae83a66f20737b6f30c6389e31
Nimrod Gileadi [Wed, 18 Jan 2017 17:06:24 +0000 (17:06 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52 am:
edfdd39433
am:
ab0fd43472
Change-Id: I860f993f1d82bb98ce921cc4749f93c098596bc7
Nimrod Gileadi [Wed, 18 Jan 2017 17:00:24 +0000 (17:00 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am:
11111d875f
am:
d70bbef6bc
Change-Id: Ie9bba383ca175ee50b393918f09c12203f5219c5
Nimrod Gileadi [Wed, 18 Jan 2017 16:59:52 +0000 (16:59 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am:
8570bcea52
am:
edfdd39433
Change-Id: I140c793c21fa7ec9b9422c94558aa842e013bb22
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:54 +0000 (16:53 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
am:
11111d875f
Change-Id: I111591054d3131d5a0b0c0011d8b5940b74ce932
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:53 +0000 (16:53 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
am:
11111d875f
Change-Id: I08546a16803fa27c99a39c15ef8cb1b12aa63249
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:23 +0000 (16:53 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
am:
8570bcea52
Change-Id: If6276de7e9eb16b4b627bc3c76599937a5100198
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:23 +0000 (16:53 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
am:
8570bcea52
Change-Id: I2a699ee186c08b60f2f5f98a00a0a5cc3230944c
Jorim Jaggi [Wed, 18 Jan 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am:
ce0bae2f47
am:
27b7101c6c
Change-Id: Idce14b6caac043b5c2880c1d46365ad0610f48a3
Jorim Jaggi [Wed, 18 Jan 2017 16:47:43 +0000 (16:47 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am:
8cbd925748
am:
b909e2c1aa
Change-Id: I4549c025a473768a504a908acf388abc0266f616
Nimrod Gileadi [Wed, 18 Jan 2017 16:44:35 +0000 (16:44 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
Jorim Jaggi [Wed, 18 Jan 2017 16:42:00 +0000 (16:42 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am:
ce0bae2f47
Change-Id: I230c5966278be38339fd369075be30320d27bcd2
OSDN Git Service
