summaryrefslogtreecommitdiff
path: root/tools
AgeCommit message (Collapse)Author
2020-05-13Do not rename R.java packageRyan Mitchell
When the --rename-resources-package flag is used, only rename the package name within the resources.arsc. Generate the R.java under the package name defined by the manifest unless --custom-package is used. (This is a cherry pick.) Bug: 147434671 Test: manual Merged-In: Id9d10e16f32533da1b67ab72ac846791526e7a76 Change-Id: Id9d10e16f32533da1b67ab72ac846791526e7a76
2020-05-12Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: ↵TreeHugger Robot
f30c225fcb Change-Id: Id6ab3fe424d9914f1ec54c0f9a4684578ed89c0b
2020-05-12Add OWNERS for display, haptics, input and powerMichael Wright
Bug: 156349083 Test: N/A Change-Id: Ia8afccfc2e470095ae3d52c827c0ac78b7c120ae
2020-05-08Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641baRyan Mitchell
Change-Id: I4a15555cf1df7c81a4d4eea2c77ec0d71df5c44f
2020-05-08Merge "Do not rename R.java package" into rvc-devRyan Mitchell
2020-05-08Merge "Use proper platform version checks (apigen)" into rvc-dev am: 0bb978de88Ruchir Rastogi
Change-Id: I43bc52a7deeb8889cdd9c5e5b560a261215d0244
2020-05-07Add --rename-resources-package to aapt2Ryan Mitchell
There is currently no way to change the package name encoded in the resources table. This change adds a flag that controls rewriting the package name encoded into the resources table. This flag does not rewrite the package name in the manifest xml. (This is a cherry pick.) Bug: 147434671 Test: manual Merged-In: I435ba07e29df0522c3a44cc5f2c460004a02d71c Change-Id: I435ba07e29df0522c3a44cc5f2c460004a02d71c
2020-05-07Use proper platform version checks (apigen)Ruchir Rastogi
Test: m statslog-docsui-java-gen Bug: 146235828 Change-Id: I5b1a2e0fa356368b91548bd050ec2c493b72f37c
2020-05-06Do not rename R.java packageRyan Mitchell
When the --rename-resources-package flag is used, only rename the package name within the resources.arsc. Generate the R.java under the package name defined by the manifest unless --custom-package is used. Bug: 147434671 Test: manual Change-Id: Id9d10e16f32533da1b67ab72ac846791526e7a76
2020-05-03Updating platform SDK version for RSvet Ganov
* Finalize resources * Update appt/aapt2 constants * Update R and SDK constants * Fix a crashloop bug Test: build + boot bug:150281259 Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
2020-05-02Updating platform SDK version for RSvet Ganov
* Finalize resources * Update appt/aapt2 constants * Update R and SDK constants * Fix a crashloop bug Test: build + boot bug:150281259 Exempt-From-Owner-Approval: merge conflict resolution Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
2020-04-30Merge "Treat non-integer target SDK as version 10000" into rvc-dev am: ↵Ryan Mitchell
7adb6a1c58 Change-Id: I67f066baf0b850817fda00c68a21ace85f6bfb3d
2020-04-30Merge "Treat non-integer target SDK as version 10000" into rvc-devRyan Mitchell
2020-04-30Treat non-integer target SDK as version 10000Ryan Mitchell
Currently aapt2 treats non-integer target SDK values as SDK level 0. This resulted in incorrect implied permission dumps. This change causes aapt2 to treat non-integer SDK values as version 10000. Bug: 155391001 Test: aapt2 dump badging CtsSkQPTestCases.apk Change-Id: Ie4312a827974a7a10b40b12f8f23d264d1b1999a
2020-04-28Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" am: 54ac3c6932 ↵Treehugger Robot
am: 996530f7c1 Change-Id: Ic0e0fe3c131c1f9960251204db36a42d2e92035e
2020-04-28Merge "Fix clang-analyzer-core.uninitialized.Branch warnings"Treehugger Robot
2020-04-28aapt2: Add command to rename overlay "targetPackage" attributeRoshan Pius
Bug: 154960712 Test: atest ManifestFixerTest Change-Id: I556fc11e271337de40c70d4ed56a0381a2f79712 Merged-In: I556fc11e271337de40c70d4ed56a0381a2f79712
2020-04-27Merge "aapt2: Add command to rename overlay "targetPackage" attribute" into ↵TreeHugger Robot
rvc-dev am: 6839fc74b6 Change-Id: I3aa0d0ec7107cb20f026e03fc0bf3ad3805c0cba
2020-04-27aapt2: Add command to rename overlay "targetPackage" attributeRoshan Pius
Bug: 154960712 Test: atest ManifestFixerTest Change-Id: I556fc11e271337de40c70d4ed56a0381a2f79712
2020-04-23Fix clang-analyzer-core.uninitialized.Branch warningsChih-Hung Hsieh
Bug: 154760495 Test: make with WITH_TIDY=1 and DEFAULT_GLOBAL_TIDY_CHECKS=clang-analyzer-core.uninitialized.Branch Change-Id: I569749166177c25e63b32fb468dccd13797acc05
2020-04-18Merge "Remove kMaxPushedAtomId from atoms_info." into rvc-dev am: e3ef95cf13Muhammad Qureshi
Change-Id: Iff16f161dccbe653331d378660730a268c6c50fb
2020-04-18Merge "Remove kMaxPushedAtomId from atoms_info." into rvc-devMuhammad Qureshi
2020-04-17Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-dev am: ↵Muhammad Qureshi
9a89a81625 Change-Id: Id2b3cef4e6e7575a3ca2bf7fe024981aacdbce3a
2020-04-17Remove kMaxPushedAtomId from atoms_info.Muhammad Qureshi
Hardcode kMaxPushedAtomId in StatsdStats. Bug: 154164020 Test: bit statsd_test:* Change-Id: Ibca731d9783686a9e3caf0ad580e1d62038d68e2
2020-04-17Merge "Remove kAtomsWithAttributionChain from atoms_info" into rvc-devMuhammad Qureshi
2020-04-17Merge "Update privacy filter for incident report protos." into rvc-dev am: ↵TreeHugger Robot
f9a1e1cb78 Change-Id: Iec36c4aefa30458b50aa4a7838be039359e6e168
2020-04-17Merge "Update privacy filter for incident report protos." into rvc-devTreeHugger Robot
2020-04-16Remove kAtomsWithAttributionChain from atoms_infoMuhammad Qureshi
Use LogEvent::getAttributionChainIndex() to check presence of attribution chains Bug: 150414252 Test: bit statsd_test:* Change-Id: Ic798d3b182c2b5aaf73444f2796d539cd3f7bf40
2020-04-16Merge "Remove kTruncatingTimestampAtomBlackList" into rvc-dev am: cbd9f03e82TreeHugger Robot
Change-Id: If2cf3789d97b582f354a619fedc955f7fe602b5c
2020-04-16Merge "Remove kStateAtomsInfo from atoms_info." into rvc-dev am: 1f976bf634Muhammad Qureshi
Change-Id: Idcb6b9e407c99d76579ce8184df800f4fd9cb575
2020-04-16Merge "Remove kTruncatingTimestampAtomBlackList" into rvc-devTreeHugger Robot
2020-04-16Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f am: 6963d8e1c8Orion Hodson
Change-Id: I2fdf3826653466d65e3d63fa896d1ec23c5716cd
2020-04-16Add explicit dependencies on jni_headersOrion Hodson
Preparation for removing implicit include paths for jni.h from soong. Also remove unnecessary jni.h includes from PathParser.{h,cpp}. Bug: 152482542 Test: lunch aosp_x86_64 && m checkbuild Change-Id: Ib18afa3d2c93ed3ce69204286d5177991100fd7e Exempt-From-Owner-Approval: build refactoring
2020-04-15Update privacy filter for incident report protos.Wenjie Zhou
Bug: 153380903 Test: manual build Change-Id: Iff1910d619983910c1e57e9ac335053415f6fa1a
2020-04-15Remove kTruncatingTimestampAtomBlackListMuhammad Qureshi
Use shouldTruncateTimestamp flag in LogEvent instead of the blacklist to determine whether timestamp should be truncated. Bug: 150414373 Test: bit statsd_test:* Change-Id: I4e21ae4909484dd898b9fcd3ce7a018f5e9d982f
2020-04-14Remove kStateAtomsInfo from atoms_info.Muhammad Qureshi
Use the annotation information in LogEvent/FieldValue instead. - Initialize nested to true in FieldValue.mAnnotations - Add filterPrimaryKey function to HashableDimensionKey for populating a HashableDimensionKey with all FieldValues that have the primary key annotation set. - Create StateTrackers without checking if atom is a state atom. (We can't do this check anymore) - Remove mAtomId, mStateField, mNested, mPrimaryFields, mDefaultState, mResetState members from StateTracker. Use the information passed in LogEvent in onLogEvent instead. - Update tests to log annotations when logging events. - Remote kStateAtomsFieldOptions from atoms_info. - Make MetricProducer::mStateGroupMap const - Rename handlePartialReset to clearStateForPrimaryKey - Store "default" states in mStateMap. An entry in mStateMap means the state is not kStateUnknown. Before, an entry in mStateMap meant the state is not the "default" state. - Consolidate all state change logic in updateStateForPrimaryKey() - remote StateTracker::updateState - handleReset and clearStateForPrimaryKey call updateStateForPrimaryKey for resetting and clearing of states respectively. - Create a helper method for notifying StateTracker listeners - Make StateManager::registerListener void Bug: 151110842 Test: bit statsd_test:* Change-Id: Ifb8371b213a178fcccaa484086fbdd283dbaec49
2020-04-10Merge "Master is now S" into rvc-dev-plus-aospTreeHugger Robot
2020-04-10Master is now SDan Willemsen
Bug: 150754986 Test: treehugger Change-Id: I44d1b5a0fea74e2bb9e332dcb8486fd30fbd2f07 Merged-In: I44d1b5a0fea74e2bb9e332dcb8486fd30fbd2f07
2020-04-09Merge "Remove kAtomsWithUidField from atoms_info" into rvc-dev am: 04d2f143cdTreeHugger Robot
Change-Id: I5963ad3025035ccae82a558783dcd27f1bd4592f
2020-04-08Remove kAtomsWithUidField from atoms_infoRuchir Rastogi
Instead of using the map from atoms_info, we now receive uid information in the form of StatsEvent annotations. The isUid annotation is exposed from both LogEvent and FieldValue. Test: bit statsd_test:* Test: atest GtsStatsdHostTestCases Bug: 150414601 Change-Id: Iebbe4ce5668de1ab91485daa1be9197cde6e8309
2020-04-08Master is now SDan Willemsen
Bug: 150754986 Test: treehugger Change-Id: I44d1b5a0fea74e2bb9e332dcb8486fd30fbd2f07
2020-04-08Merge "Initialize nested to true" into rvc-dev am: b96e3e317bTreeHugger Robot
Change-Id: I7f218189c022fb4ff976e62ae29a87f806bd4c71
2020-04-07Initialize nested to trueMuhammad Qureshi
This fixes random nested values in atoms_info. Bug: 153119080 Test: m libstatsmetadata Change-Id: I1c1900dae1701b28a8db6ee257f5730e71e574eb
2020-04-04Merge "Make state_option top-level boolean annotations" into rvc-dev am: ↵TreeHugger Robot
4e83de27c2 Change-Id: Ib507bb59dbb29e10e41bf4a5fa95dd69cdc3d45e
2020-04-03Make state_option top-level boolean annotationsMuhammad Qureshi
- Add AnnotationId enum stats-log-api-gen - Rename RESET_STATE annotation to TRIGGER_STATE_RESET. Also rename the proto annotation. Bug: 152412767 Test: stats-log-api-gen-test Test: m statslog-framework-java-gen Change-Id: I2c12ea0b9222ef28b8cc11ea36b272e518a96259
2020-04-02Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5Muhammad Qureshi
Change-Id: I8860ed3f9f009ae349f8dab7bac1fa9fda314b69
2020-03-31Use constant names instead of literalsMuhammad Qureshi
Use constant names instead of literals when writing annotations to increase readability. FrameworkStatsLog.java: https://paste.googleplex.com/4789132691767296 statslog.h: https://paste.googleplex.com/4986214782337024 statslog.cpp: https://paste.googleplex.com/4856851575341056 Bug: 151786433 Test: m statslog-framework-java-gen Test: m libstatslog Change-Id: I47111fe02319bebf41f429642fb675f7a856710b
2020-03-30Merge changes I6f6b4d78,I874696cf into rvc-dev am: b7df0eb9a6TreeHugger Robot
Change-Id: Ic56a311ea4b54664eafcfc623580bcf30fc98bfb
2020-03-30Merge changes I6f6b4d78,I874696cf into rvc-devTreeHugger Robot
* changes: Only send reset state annotation when needed Group annotations for the same atom id
2020-03-30Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev ↵Narayan Kamath
am: 924069c2aa Change-Id: Ieb278c96432a0a23d65752a2c89365b02ed936f4