Commits · b68c75788d5e88f7efba086d8a49eed61a68b8dc · CodeLinaro / la / platform / external / tinyxml2

Feb 20, 2021

[automerger skipped] Mark ab/7061308 as merged in stage. am: -s... · b68c7578

Xin Li authored 4 years ago

[automerger skipped] Mark ab/7061308 as merged in stage. am: a7ff3fb7 -s ours am: 40f0dfc0 -s ours

am skip reason: Change-Id I0a21f6d5f96192571b97b59dcfbd9f0e29d9eb14 with SHA-1 5f4a5c65 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3b8aa21560d0354e7fb87d445af0ab64cbc4075

b68c7578

[automerger skipped] Mark ab/7061308 as merged in stage. am: -s ours · 40f0dfc0

Xin Li authored 4 years ago

am skip reason: Change-Id I0a21f6d5f96192571b97b59dcfbd9f0e29d9eb14 with SHA-1 5f4a5c65 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74da97eabf1f31d11409b30a68f22b1456859ccc

40f0dfc0

Mark ab/7061308 as merged in stage. · a7ff3fb7

Xin Li authored 4 years ago

Bug: 180401296
Merged-In: I0a21f6d5f96192571b97b59dcfbd9f0e29d9eb14
Change-Id: I7b45be241d2b0807c157f33ffd895ce9248dbe34

a7ff3fb7

Feb 12, 2021

Merge "Add LOCAL_LICENSE_KINDS to external/tinyxml2" am: am: am: · 4eb6e09a

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1586030

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I133b0fcdb2c2d0b95e55263969bcc39fc95810fa

4eb6e09a

Merge "Add LOCAL_LICENSE_KINDS to external/tinyxml2" am: am: · 0ac77b34

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1586030

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cba20ce64cf13ee104321cc2206e38f23a9d89a

0ac77b34

Merge "Add LOCAL_LICENSE_KINDS to external/tinyxml2" am: · 60b5f562

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1586030

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b8ef814c25bf60ac55764af118fd4ec6aca757c

60b5f562

Merge "Add LOCAL_LICENSE_KINDS to external/tinyxml2" · 7ac4aa75
Bob Badour authored 4 years ago

android-s-preview-1

7ac4aa75

Add LOCAL_LICENSE_KINDS to external/tinyxml2 · 228c8540

Bob Badour authored 4 years ago

Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT SPDX-license-identifier-Zlib
    legacy_unencumbered
to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I4d310c7fbd377840e66706183a890561eb1a05a2

228c8540

Jan 27, 2021

Merge "Fix license_type. ... AND GPL" am: am: am: · 33d74712

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1556526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34d5b53df2df5d082e45b084f15cef9d161f3280

33d74712

Merge "Fix license_type. ... AND GPL" am: am: · feca79dd

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1556526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9531893add5c183ebb97c2d4d80ae0880c98bb2

feca79dd

Merge "Fix license_type. ... AND GPL" am: · feda0c4e

Bob Badour authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1556526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3104bf2e9a7422ad4a99cf7df3078f217e9fd08

feda0c4e

Merge "Fix license_type. ... AND GPL" · d82ddf91
Bob Badour authored 4 years ago

d82ddf91

Jan 21, 2021

Fix license_type. ... AND GPL · 159dcd4a

Bob Badour authored 4 years ago

See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237
Change-Id: I5e674f350b39e17f46ad7dd511c4c14d51bfe6ee

159dcd4a

Nov 25, 2020

Mark ab/6881855 as merged am: am: · 9285263e

Xin Li authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tinyxml2/+/13112872

Change-Id: Ifcea133c39dbba4b1c5ab9a228eb863fb265bcc9

9285263e

Mark ab/6881855 as merged am: · 5f4a5c65

Xin Li authored 4 years ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tinyxml2/+/13112872

Change-Id: I0a21f6d5f96192571b97b59dcfbd9f0e29d9eb14

5f4a5c65

Nov 23, 2020
- Mark ab/6881855 as merged · c3e5454d
  Xin Li authored 4 years ago
```
Bug: 172690556
Change-Id: I763715aaf21ef097afebdd0b9bb80ca18a940820
```
  c3e5454d
Nov 12, 2020

Merge "Add product_available to product available modules" am: am:... · e9a46fa1

Treehugger Robot authored 4 years ago

Merge "Add product_available to product available modules" am: 68bf40d8 am: ed86a313 am: 1e748ef0 am: 9ef96432

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1495858

Change-Id: I546b72c96afb169d39341a6300cfbb3f237767d2

e9a46fa1

Merge "Add product_available to product available modules" am: am:... · 9ef96432

Treehugger Robot authored 4 years ago

Merge "Add product_available to product available modules" am: 68bf40d8 am: ed86a313 am: 1e748ef0

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1495858

Change-Id: I6006edeaaefff360db8997409fec6b5602d09aee

9ef96432

Merge "Add product_available to product available modules" am: am: · 1e748ef0

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1495858

Change-Id: Idda45618f34feb5d554dd8378785c8222998e98e

1e748ef0

Merge "Add product_available to product available modules" am: · ed86a313

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1495858

Change-Id: I820de0fe83e0792b02b38dd9956ea67c1fda91f4

ed86a313

Nov 11, 2020

Merge "Add product_available to product available modules" · 68bf40d8
Treehugger Robot authored 4 years ago

68bf40d8

Add product_available to product available modules · a564253d

Justin Yun authored 4 years ago

vendor_available modules were available to product modules.
However, not all vendor_available modules are required to be
available to product modules. Some modules want to be available only
to product modules but not vendor modules.

To cover the requirement, we separate product_available from
vendor_available.
vendor_available will not provide product available module.

Bug: 150902910
Test: build
Change-Id: Iddab20eadd4763b17469f8779de42442d983c90c

a564253d

Oct 26, 2020

Merge "Run tinyxml2 tests in presubmit." am: am: am:... · ca2fb687

Elliott Hughes authored 4 years ago

Merge "Run tinyxml2 tests in presubmit." am: 8ff7e931 am: 903a7328 am: dea5c0c3 am: b92ea84a

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1471260

Change-Id: I93aaf1046bbf2282520e63e1ba40adcec8389520

ca2fb687

Merge "Run tinyxml2 tests in presubmit." am: am: am: · b92ea84a

Elliott Hughes authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1471260

Change-Id: I9cf88ab4f930742f28deec769c4263a4e5f37b4b

b92ea84a

Merge "Run tinyxml2 tests in presubmit." am: am: · dea5c0c3

Elliott Hughes authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1471260

Change-Id: I3e29b95b84ccde90c4385224183e5c346903d52e

dea5c0c3

Merge "Run tinyxml2 tests in presubmit." am: · 903a7328

Elliott Hughes authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/external/tinyxml2/+/1471260

Change-Id: I5f56b0b5aca1b28addd18544f80da3694c01a8d9

903a7328

Merge "Run tinyxml2 tests in presubmit." · 8ff7e931
Elliott Hughes authored 4 years ago

8ff7e931

Oct 22, 2020
- Run tinyxml2 tests in presubmit. · 5bd35123
  Elliott Hughes authored 4 years ago
```
Test: atest tinyxml2-tests
Change-Id: I58fda1132e91b40a54696707cb2784d2a4806256
```
  5bd35123
Apr 24, 2020
- Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am:... · 947b02d0
  Treehugger Robot authored 4 years ago
```
Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am: 0ad38bb1 am: 3c92d0d6 am: 86691e2c am: 661175a0

Change-Id: Iaa7d141e752c392fe34668ae779050a074324793
```
  947b02d0
- Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am:... · 661175a0
  Treehugger Robot authored 4 years ago
```
Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am: 0ad38bb1 am: 3c92d0d6 am: 86691e2c

Change-Id: I34ab9548a61ba134dc93328a28037f4f28671b79
```
  661175a0
- Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am: 0ad38bb1 am: 3c92d0d6 · 86691e2c
  Treehugger Robot authored 4 years ago
```
Change-Id: I6c72121e2f483b8348267131b68895aadccd35eb
```
  86691e2c
- Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 am: 0ad38bb1 · 3c92d0d6
  Treehugger Robot authored 4 years ago
```
Change-Id: I5cb0037b4fdfa7b1810ac986cdba7852ce55b782
```
  3c92d0d6
- Merge "Add license type: MIT+zlib are NOTICE licenses" am: 87b887a4 · 0ad38bb1
  Treehugger Robot authored 4 years ago
```
Change-Id: I9de7bd6c93cd654c031d8932a874615c89310cb6
```
  2 tags
  
  0ad38bb1
- Merge "Add license type: MIT+zlib are NOTICE licenses" · 87b887a4
  Treehugger Robot authored 4 years ago
  
  87b887a4
Apr 23, 2020

Add license type: MIT+zlib are NOTICE licenses · f2cf790e

Bob Badour authored 4 years ago

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: Iafe7e92b83e190333312e0e97b8187773574dd7e

f2cf790e

Apr 10, 2020

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · 163a0c14

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 856bd5d3 -s ours am: 2ec8d0fd am: 6ff585a4 am: 7baf5bb1 -s ours

am skip reason: subject contains skip directive

Change-Id: Icdad93b95736295fe00acda404ac40320b9753b5

163a0c14

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · 7baf5bb1

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 856bd5d3 -s ours am: 2ec8d0fd am: 6ff585a4

Change-Id: I0344ac3b2842e31bed99010ab877686e81152949

7baf5bb1

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · 6ff585a4

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 856bd5d3 -s ours am: 2ec8d0fd

Change-Id: I6ef215c4c71a8b5e34b19fefec93c2b81767a327

6ff585a4

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · 2ec8d0fd

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 856bd5d3 -s ours

am skip reason: subject contains skip directive

Change-Id: I8b2e69bfdbdefc5cbf3b4b7cb59f36f80de80e10

2ec8d0fd

DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master · 856bd5d3
Xin Li authored 4 years ago
```
Bug: 151763422
Change-Id: Idb7a4e466e8af4f50e85a5697245dc4cba912437
```
856bd5d3