Home
last modified time | relevance | path

Searched refs:merge (Results 1 – 19 of 19) sorted by relevance

/tools/platform-compat/build/
Dprocess-compat-config-test.py51 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), …
56 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), …
57 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1235" name="TEST_CHANGE2" /></config>'),…
63 self.merger.merge(io.BytesIO(
66 self.merger.merge(io.BytesIO(
76 self.merger.merge(io.BytesIO(
85 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), …
86 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE2" /></config>'),…
92 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), …
93 …self.merger.merge(io.BytesIO(b'<config><compat-change id="1235" name="TEST_CHANGE" /></config>'), …
[all …]
Dprocess_compat_config.py64 def merge(self, xmlFile, source): member in ConfigMerger
130 config.merge(xml_content.xml, "%s:%s" % (jar.name, xml_content.source))
133 config.merge(xml, xml.name)
/tools/test/connectivity/acts_tests/tests/google/tel/live/
DTelLiveGFTDSDSSupplementaryServiceTest.py697 merge=True, argument
902 if not merge:
1216 merge=False, disable_cw=False):
1224 merge=False,
1239 merge=False,
1248 merge=False,
1263 merge=False,
1272 merge=False,
1287 merge=False,
1296 merge=False,
[all …]
DTelLiveGFTDSDSWfcSupplementaryServiceTest.py686 merge=True, argument
911 if not merge:
1024 merge=False,
1035 merge=False,
1046 merge=False,
1057 merge=False,
1068 merge=False,
1080 merge=False,
1091 merge=False,
1102 merge=False,
[all …]
/tools/test/connectivity/acts_tests/acts_contrib/test_utils/gnss/
Dgnss_testlog_utils.py289 lambda item1, item2: pds.merge(item1, item2, on='time_row_num'), [
294 sv_stat_df = pds.merge(sv_stat_df,
302 lambda item1, item2: pds.merge(item1, item2, on='time_row_num'), [
307 loc_info_df = pds.merge(loc_info_df,
375 lambda item1, item2: pds.merge(item1, item2, on='phone_time'),
378 sv_stat_df = pds.merge(sv_stat_df,
386 lambda item1, item2: pds.merge(item1, item2, on='phone_time'),
389 sv_stat_df = pds.merge(sv_stat_df,
396 lambda item1, item2: pds.merge(item1, item2, on='phone_time'),
399 loc_info_df = pds.merge(loc_info_df,
/tools/metalava/src/main/java/com/android/tools/metalava/
DBaseline.kt50 var merge: Boolean = false, in <lambda>() variable in com.android.tools.metalava.Baseline
64 if (file?.isFile == true && (!silentUpdate || merge)) { in <lambda>()
306 var merge: Boolean = false in <lambda>() variable in com.android.tools.metalava.Baseline.Builder
326 return Baseline(description, file, updateFile, merge, headerComment) in <lambda>()
DOptions.kt1011 builder.merge = (arg == ARG_MERGE_BASELINE) in <lambda>()
/tools/carrier_settings/java/
DGenDeviceSettings.java87 TextFormat.getParser().merge(br, registry, builder); in generate()
113 TextFormat.getParser().merge(br, registry, builder); in generate()
139 TextFormat.getParser().merge(br, registry, builder); in generate()
DGenCarrierList.java88 TextFormat.getParser().merge(br, builder); in generate()
DCarrierConfigConverterV2.java298 TextFormat.getParser().merge(br, builder); in convert()
391 TextFormat.getParser().merge(textpbReader, aospCarrierList); in loadAospCarrierList()
/tools/external_updater/
Dgit_updater.py80 git_utils.merge(self._proj_path, self._new_ver)
Dgit_utils.py141 def merge(proj_path: Path, branch: str) -> None: function
DREADME.md46 When upgrade, the tool will simply run `git merge tag/sha`.
/tools/trebuchet/core/model/src/main/kotlin/trebuchet/model/fragments/
DProcessModelFragment.kt63 fun merge(other: trebuchet.model.fragments.ProcessModelFragment) { in <lambda>() method
/tools/trebuchet/core/common/src/main/kotlin/trebuchet/importers/ftrace/
DFtraceImporterState.kt66 existing.process.merge(process) in <lambda>()
/tools/metalava/src/test/java/com/android/tools/metalava/model/psi/
DPsiTypePrinterTest.kt179 fun `Test merge annotations`() { in <lambda>()
/tools/metalava/src/test/java/com/android/tools/metalava/
DDriverTest.kt985 merge: Boolean in <lambda>()
990 if (!(updateContent != null || merge)) { in <lambda>()
/tools/repohooks/
DREADME.md142 that are merged. Hooks will still run on the merge commit itself.
/tools/metalava/
DREADME.md82 * Ability to merge in data (annotations etc) from external sources, such as