)]}' { "log": [ { "commit": "48fefdd2cde1bf0e7f3075c23dbd4cf148f31570", "tree": "ed7af5406052b9e7b7305fd3cf2bb6c578f8e460", "parents": [ "ce4a43498f694fc5f85fbf684b312713f1840520" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Dec 18 11:38:31 2023 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Dec 19 13:45:35 2023 +0000" }, "message": "Remove unnecessary --api-lint-ignore-prefix options\n\nThe `--api-lint-ignore-prefix` option adds a package prefix within\nwhich API lint checks will be ignored. However, the options are\nnot actually necessary. That is because they are only used in the\n`android-non-updatable-stubs-defaults` and the non updatable code does\nnot include any source classes from those packages.\n\nWhile modules that do use `android-non-updatable-stubs-defaults` do\ninclude classes from those packages on the classpath they are already\nexcluded from having API lint checks performed on them as they do not\ncontribute to the API surface being generated by those modules.\n\nBug: 311690008\nTest: m checkapi\nChange-Id: Ife750c586edc2b5af92c0b5e9211b23345083f69\n" }, { "commit": "990fd8dd114548ab80ccc11dfd4a2b87d79d748b", "tree": "59501e95088c62342cad2ed153f782b053c94a35", "parents": [ "0b50679bdf82dc0bf69a91cdcab2814ca0383aaa" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Wed Dec 13 23:48:56 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Dec 14 01:29:01 2023 +0000" }, "message": "Rename to match internal storage format.\n\nBug: 312784289\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: Ibc2e1af9c3346543365ce42058b6e5913161da9f\n" }, { "commit": "46f743d1276d7aed3f5c77f11ef409d98946cc49", "tree": "5a87e67a8ce092c383f802569a5b56c21bc82749", "parents": [ "c809fceefd3e481d5d6a5a2c68746398c7cfc40c", "c6420766f0a5755bd9d1f3701d198e12231dbd67" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Dec 11 23:12:53 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 23:12:53 2023 +0000" }, "message": "Merge \"Remove bp2build from frameworks/base/api/\" into main" }, { "commit": "2be985dfdb4a6e5fe621fb281149a5d00ab167aa", "tree": "eefdff2f8da496600b45003e72d123260ce37173", "parents": [ "52553becb6fe08627cb3410b0b37ac2fa0d461ac", "090155e821aa6c0cbed99c96c265f4ee55c73a7a" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 16:45:46 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 16:45:46 2023 +0000" }, "message": "Merge \"Change API format in the map file.\" into main" }, { "commit": "090155e821aa6c0cbed99c96c265f4ee55c73a7a", "tree": "0fe2c5ba0192d4bf851f825904ae3421299547c8", "parents": [ "f5d3064cee0ea3ee0a318f735896e67327c24cdb" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 08:29:41 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 08:40:18 2023 +0000" }, "message": "Change API format in the map file.\n\n* Parameter list should be a part of the API signature.\n* Package, class, and method names are stored separately so they don\u0027t\n need to be parsed when being read.\n\nBug: 315412454\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: I769cc10831f1c50c71e71cbaadec355f21258baf\n" }, { "commit": "c6420766f0a5755bd9d1f3701d198e12231dbd67", "tree": "da872f16a76b95b3aee60ce2c614a74187bba4fc", "parents": [ "82eae7148477a47db1316e6cc3a4717cd2b73773" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Dec 07 12:38:40 2023 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Dec 07 16:56:07 2023 -0800" }, "message": "Remove bp2build from frameworks/base/api/\n\nBug: 315353489\nTest: m blueprint_tests\nChange-Id: I50d938017203ad12198d8a6373c9aef80a8535c6\n" }, { "commit": "a7a5a2619901d1973c4e5376c4fe050822fbe773", "tree": "bd77c4801f2c943772824b90ab13aba4dbb54320", "parents": [ "c30dff8f85b6e365fb1b281daad75014265ee53f", "0fa80893dadb5a1fd8cbd87cc45eab80679f5879" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Dec 01 17:12:39 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 01 17:12:39 2023 +0000" }, "message": "Merge \"Created empty framework-nfc non-updatable module\" into main" }, { "commit": "f5d3064cee0ea3ee0a318f735896e67327c24cdb", "tree": "601e3b45fbf03b76dc839dd6b51c6000caa1e93b", "parents": [ "47cf4f1645b536a7c4824a33eae0f9e3f7acdc81", "74068a17b94e475d113a1ed5314a78bdce39c8de" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Tue Nov 21 17:01:36 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 21 17:01:36 2023 +0000" }, "message": "Merge \"Extract flagged APIs in the nested classes.\" into main" }, { "commit": "25783f370d3700d21e240af03fb151fd6013bbe8", "tree": "6e9203026a0512af7e42e087e785c6f41b37791c", "parents": [ "67bb3d4e5d6d720364f472c1d62f9d437c48215b", "ea84fc8143136fd314e56e8d877a3f7f031e0724" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 21:23:21 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 20 21:23:21 2023 +0000" }, "message": "Merge \"Build flag to API mapping files.\" into main" }, { "commit": "ea84fc8143136fd314e56e8d877a3f7f031e0724", "tree": "0cb22b7796fa85c5c359ae5be51bce79b8a948a6", "parents": [ "5c8faa654da42b78960e9563c5ad156835492a1e" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 08:01:56 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 08:52:06 2023 +0000" }, "message": "Build flag to API mapping files.\n\nFlag to API mapping files will be built and uploaded to `droid` target.\n\nTest: m flag-api-mapping-PublicApi\n m flag-api-mapping-SystemApi\n m flag-api-mapping-ModuleLibApi\n m flag-api-mapping-SystemServerApi\nBug; 311059624\n\nChange-Id: Ibb872e2c1f7772af59427bcec3ce6f6551a8dd17\n" }, { "commit": "74068a17b94e475d113a1ed5314a78bdce39c8de", "tree": "2b9c95f670a42a29bc6033908ff404b4d3a983b3", "parents": [ "5c8faa654da42b78960e9563c5ad156835492a1e" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 07:47:25 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 07:47:25 2023 +0000" }, "message": "Extract flagged APIs in the nested classes.\n\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nBug: 311059624\nChange-Id: I7db4296e4ee78268b886b83cd822d8ebe151c4a5\n" }, { "commit": "0fa80893dadb5a1fd8cbd87cc45eab80679f5879", "tree": "9f1c26f71409a79caa25261c1a8412868b383951", "parents": [ "f580f13013559ddb682e1a9e36171e578412bfcb" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Nov 14 14:30:26 2023 -0800" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Nov 17 14:53:18 2023 -0800" }, "message": "Created empty framework-nfc non-updatable module\n\nBug: 303286040\nTest: Device boots up after flashing\nMerged-In: Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e\n\nChange-Id: Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e\n" }, { "commit": "39c4a124d4144870678c1af401d6f82321b28fe8", "tree": "2d4bf7d369a53639bc3a7ab388f7663f8bfe1643", "parents": [ "d4edff2661a7a9de7e79035d2b81afbcd7af5c14", "468a6f7f4b7fd32f09bb78b021fc9a23e411d6b1" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Fri Nov 17 10:30:16 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 17 10:30:16 2023 +0000" }, "message": "Merge \"Revert \"Revert \"Added new framework-pdf jar inside MediaProvider...\"\" into main" }, { "commit": "2563720cb5def93ec0e10be90f2c30c001644435", "tree": "bcada3810a70ebe7851a25b67d991af9d42f21fe", "parents": [ "6fee432f445c5c90ca9d69f5b332630ccfd233bf", "a95134ca6dda5f5e41562d55696918ab32ea07a1" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Nov 16 18:00:06 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 16 18:00:06 2023 +0000" }, "message": "Merge \"Extract the mapping of flags to APIs.\" into main" }, { "commit": "a95134ca6dda5f5e41562d55696918ab32ea07a1", "tree": "6c6826faa6181adcbc916972bd1326dc9e8eb068", "parents": [ "3fc4d3967e6f74ee11bafb1cde34b2ea4ba21d99" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Wed Nov 15 00:26:25 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Nov 16 09:19:15 2023 +0000" }, "message": "Extract the mapping of flags to APIs.\n\nThis CL creates a binary that extracts flagged APIs from an API\nsignature file, and writes the mapping of flags to APIs to a pb file.\n\nBug: 311059624\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: I9b6f45bd126cd6a5b2ed1e9f83bdaa12dd580480\n" }, { "commit": "3d70bb0a5de207a446f71db5687951a45e46a242", "tree": "8334c4a0f81d650219f8303de317da383f865ccb", "parents": [ "c988c576445819fc8d0efddf537744c68944ec41", "ed0743daac4104dcfbfd781a2d6b298b21e6d038" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Nov 15 11:43:29 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 15 11:43:29 2023 +0000" }, "message": "Merge \"Revert \"[CrashRecovery] Add module lib to Android SDK\"\" into main" }, { "commit": "ed0743daac4104dcfbfd781a2d6b298b21e6d038", "tree": "d90028ecad1341c49d297702035acdb8f94d7745", "parents": [ "9c3742afa1ed0923888b7f1ba69772373479f415" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Nov 15 07:39:58 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Nov 15 08:27:25 2023 +0000" }, "message": "Revert \"[CrashRecovery] Add module lib to Android SDK\"\n\nRevert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943\n\nReason for revert: Leading to merge conflict\nBug: b/311082270\n\nReverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943\n\nChange-Id: Ic80afd7a8e09cf2e0cf6e453cbe004db0c9fcbd7\nMerged-In: I5c65d85d50b214926f5473908694070b4e896201\n" }, { "commit": "468a6f7f4b7fd32f09bb78b021fc9a23e411d6b1", "tree": "0d01606bdaf05ec1e95e9271cfae1e7ec80f3aef", "parents": [ "85be1d3879e26dc2217266ccdf145aeba487bf08" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Wed Nov 08 16:03:53 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 08 16:04:00 2023 +0000" }, "message": "Revert \"Revert \"Added new framework-pdf jar inside MediaProvider...\"\n\nRevert submission 2775627-revert-2759049-framework-pdf-UAOVGTHHXO\n\nReason for revert: submit together with the fix to allow this new jar to coexist w/ mainline prebuilts\n\nReverted changes: /q/submissionid:2775627-revert-2759049-framework-pdf-UAOVGTHHXO\n\nChange-Id: Idf009cf17e142a04f4ca73396c6559c14504fc6a\n" }, { "commit": "648b0db8cb1118c88b085e2844fc8ae92f163942", "tree": "3cad9af520128b08f570fdd4ed404031e436cc7c", "parents": [ "352e1eb9b49f38cac0b9deb5e82af65f8d3aca69" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 19:24:42 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 19:26:39 2023 +0000" }, "message": "Share list of libs to depend on for APIs\n\nThe non-updatable part of the API has a few deps on module APIs. Extract\nthe list of libs to satisfy those deps into a variable so that it can be\nshared between the stubs_default and the java_library.\n\nTest: m\nChange-Id: Id416d294150131b477fc9c73a2d5811cfbf7012f\n" }, { "commit": "a3c89188ebb61011c20f9203fd18ed6ac85bb4fb", "tree": "8c64c7e0286b9b593780fa4a15e6807a1a943db9", "parents": [ "b8fe0e98bd5e4bea106ee4c9e35081dcef0af21d", "6f2dea9c3a3dc10cc6fe14a89df384da3db5ffc6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Nov 02 14:38:07 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 02 14:38:07 2023 +0000" }, "message": "Merge \"Move some API rules out of top-level Android.bp\" into main" }, { "commit": "6f2dea9c3a3dc10cc6fe14a89df384da3db5ffc6", "tree": "9651211718be976c14575ab77efc55b7bc64de6d", "parents": [ "14e7f959b5d9ce718c3a4c1b2d2b76ad9f448bd3" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:44:55 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:44:55 2023 +0000" }, "message": "Move some API rules out of top-level Android.bp\n\nThese defaults are used by api / stub modules, so move them into\nthe api subdir.\n\nTest: m\nMerged-In: I97661daa1c4c3cba6c31ccf1212334a41adaa271\nChange-Id: I97661daa1c4c3cba6c31ccf1212334a41adaa271\n" }, { "commit": "dadbc58d52b0cb244f4d8cb99a79c118ab137798", "tree": "b1a2645a6a3a7a381e5c621fa3ea19d4cf580de9", "parents": [ "c056440a34955acdaf059ca3ed4d605981781de6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 30 12:17:25 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 30 12:17:25 2023 +0000" }, "message": "Move aconfig-srcjars srcs into shared defaults\n\nThis ensures they\u0027re consistently added to all droidstubs modules\nfor the non-updatable part.\n\nTest: presubmit\nChange-Id: Ia17808572b3fa8d75cdc71e7981d562ad0036afc\n" }, { "commit": "4c4a9c3eebf99c47e77c2f8eaea487ec2745007a", "tree": "31a245aee3768a66407560ca8e474ee133b4c796", "parents": [ "04e59b174f08920d7b39982b8a4b13d2385928ea" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 26 11:18:56 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 26 12:59:21 2023 +0100" }, "message": "Replace `--dex-api` with `signature-to-dex` instead\n\nBug: 307737035\nTest: m combined-removed-dex\n # Check before and after to make sure there are no differences\nChange-Id: I51e774e6a340d310b96c0291b04f66b4737aebda\n" }, { "commit": "5e416bb876f572cb3cbc5feaf3e4bd4e97d2c81d", "tree": "1b96f9f851cfb217af2bf45c18541c95ce0a1ee4", "parents": [ "55722bf523c4defd0ad0443441ce7e783060001d", "84a0e71aa349a4e53e7cf6083bc0cc728c6821ce" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 25 12:09:45 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 25 12:09:45 2023 +0000" }, "message": "Merge \"Migrate droidstubs/droiddoc to flags\" into main" }, { "commit": "b0a5dffa7c55c3066c0018bc51517b07098faf99", "tree": "6bc4aa79a085b3ca04852f291c3eae1f4624ce07", "parents": [ "a81ea29d7f8b9de919f6b1c3781f7798f13172fb", "3cc5e00e15481e2c3288a7a206e98b083852a528" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 24 12:43:36 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 12:43:36 2023 +0000" }, "message": "Merge \"Created empty framework-location non-updatable module\" into main" }, { "commit": "a81ea29d7f8b9de919f6b1c3781f7798f13172fb", "tree": "9f48bb844a8fd309fe25d011896462dc083687a6", "parents": [ "d3c5bea1e1ca19ccb0ce080b0334f3cf2f798344", "e35b1384812f82f2c7a75494c83b96c9b39e3c46" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 24 10:06:54 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 10:06:54 2023 +0000" }, "message": "Merge \"SdkTestCore for non-updatable modules\" into main" }, { "commit": "3cc5e00e15481e2c3288a7a206e98b083852a528", "tree": "b94642762ee1605667d45b889788f8d66fcab503", "parents": [ "e35b1384812f82f2c7a75494c83b96c9b39e3c46" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Mon Aug 07 11:18:09 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 17:42:10 2023 +0000" }, "message": "Created empty framework-location non-updatable module\n\nNote that this is a re-cherry-pick of the original CL that is closer\nto the original CL than the first CP, to minimize the number of\nconflicts in Android.bp files.\n\nBug: 289776578\nTest: presubmit\nMerged-In: I721fc4ae5c62cf1eada9bb6b4e5b3f1a4c9db21a\nChange-Id: Ibf98f37cb795bc7f627a485546b6ce8ec23b3a9e\n" }, { "commit": "e35b1384812f82f2c7a75494c83b96c9b39e3c46", "tree": "e6672f036e13adf10d06c66a97b0fa80607abf23", "parents": [ "7d0b6b0e9da0d8fc60a43756ea6918fe7cbaeedb" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Sat Aug 12 01:31:26 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 15:17:43 2023 +0000" }, "message": "SdkTestCore for non-updatable modules\n\nProvides SdkTestCore/test_core_current sdk_version for non-updatable\nmodules that have their test scope dependent on test apis from\nframework-minus-apex.\n\nIgnore-AOSP-First: Change in topic with internal-first projects\nBug: 289776578\nTest: m checkapi\n\nMerged-In: I855346c01bb609e81b14dbdc13330315badc339e\nChange-Id: I855346c01bb609e81b14dbdc13330315badc339e\n" }, { "commit": "84a0e71aa349a4e53e7cf6083bc0cc728c6821ce", "tree": "d2fd60e190ac6368febf1ccb7fb86b37576ea7da", "parents": [ "440f3cf26ac8d2df7948d2271c92037743bae5ad" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 09:17:45 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 10:55:47 2023 +0000" }, "message": "Migrate droidstubs/droiddoc to flags\n\nThe args attribute does not work well with defaults as it\u0027s just a\nstring, which cannot be extended. Migrate to the flags attribute.\n\nBug: 306806877\nTest: diff ninja file before/after\nChange-Id: Ifd1d503d2da29bf1cdf2664201f9c8276f9480a4\n" }, { "commit": "440f3cf26ac8d2df7948d2271c92037743bae5ad", "tree": "66332302588d725791f8bdea8ba65baad6ef94b5", "parents": [ "7d0b6b0e9da0d8fc60a43756ea6918fe7cbaeedb" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Sep 20 10:03:31 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 10:54:49 2023 +0000" }, "message": "FlaggedApi: enable enforcement for all non-updatable APIs\n\n(cherry pick of 7da1d25541124cf0c6ced6eb0af738fb9263b77a\n and 38dd161e4f88b43e7d251f8888714d79c2557b7f)\n\nBug: 297362755\nTest: make checkapi\nMerged-In: If7333ead86d9028ab0a1cc8f25fc534cb13a1858\nMerged-In: I4d384efac8a8d3b183d9b207b195ad5489db9e55\nChange-Id: I4d384efac8a8d3b183d9b207b195ad5489db9e55\n" }, { "commit": "f8ced8b7c50385c330224d28ba5be81a558b67f6", "tree": "94420a3401632e49c4b30b073da296d981a6225b", "parents": [ "a8b4f6f7afb3c6b3f2337b86dee94adc083573df", "beeb35a8d65c14c592d3ba19114372ae3cd1e50f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 20 16:40:40 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 20 16:40:40 2023 +0000" }, "message": "Merge \"Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current\" into main" }, { "commit": "a8b4f6f7afb3c6b3f2337b86dee94adc083573df", "tree": "5f4a9fca25035faa2e975ac8a6b1b190e2c56dec", "parents": [ "1b18e3d1da3c212734c85439a97ca30f4ed22362", "82eef15abe01b4c1078e453ee448789486ee0235" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 16:28:10 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 20 16:28:10 2023 +0000" }, "message": "Merge \"Explain the -hide params passed to doclava\" into main" }, { "commit": "82eef15abe01b4c1078e453ee448789486ee0235", "tree": "b5bf64b6dd261714257145a714352ef451cd50f7", "parents": [ "016f05cb067643a1b239123b995944dca1d40515" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 13:06:43 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 13:17:02 2023 +0000" }, "message": "Explain the -hide params passed to doclava\n\nThe reason certain checks are disabled in doclava is that they have been\nimplemented in metalava instead. Clarify that.\n\nTest: presubmit\nChange-Id: I32c32783dea59a63d95d14b4ad636159536c2944\n" }, { "commit": "4b2f12ca3e0433d24c776ce99730cc28ef6ade35", "tree": "c70a2d9e2830409d7433277a416af68df23c2f2f", "parents": [ "6a63d356f561f05f0df388f3aed487c4bbeb8f37", "9c3742afa1ed0923888b7f1ba69772373479f415" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 18 17:01:24 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 18 17:01:24 2023 +0000" }, "message": "Merge \"[CrashRecovery] Add module lib to Android SDK\" into main" }, { "commit": "beeb35a8d65c14c592d3ba19114372ae3cd1e50f", "tree": "f76a75c17f885ad8457c9296cbf27c0510cb395e", "parents": [ "358637313b09d4658b9a0a4b04e3d2f86fed08ba" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Oct 17 22:22:24 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Oct 17 22:22:24 2023 +0000" }, "message": "Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current\n\nJust like all other android_*_stubs_current modules,\nandroid_test_frameworks_core_stubs_current is added to classpath of the\njavac compilation of its reverse dependencies, and its static libs is\ndynamically switched between the \".from-source\" suffixed from-source\nstub compiling java_library module and the \".from-text\" suffixed\nfrom-text stub compiling java_api_library module.\n\nOther than the origin of the stubs, the two modules are expected to\ncontain (mostly) identical APIs. However, the two static libs of\nandroid_test_frameworks_core_stubs_current currently do not follow this\nprinciple as the from-source java_library module does not add the\n\"private-stub-annotation-jar\" as static lib, while the from-text\njava_api_library does. This discrepancy lead to compilation error of the\nreverse dependencies when defaulting build to from-text stub generation.\n\nThis change fixes the discrepancy between the two modules by removing\n\"private-stub-annotation-jar\" from the static lib of the from-source\nmodule and making the two modules behave more similarly.\n\nTest: patch on internal main and run `m framework-location.stubs.test.from-source --build-from-text-stub`\nBug: 301522358\nChange-Id: I821b7bb25a8f7ec7f9977a01ebdfbd5f1b25cf5e\n" }, { "commit": "dd97b7840562cb31d350fa98429769cb4a939031", "tree": "39787e59cca6dc4ba7bcc4b0eb9c8c76043377ad", "parents": [ "52cc77c3163c853bddaffc3f34fdf286369e617b" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 18:37:12 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 22:26:05 2023 +0100" }, "message": "Use lint database from api_version_system\n\nDroidstubs now support using the api-versions.xml from another\ndroidstubs module, so reuse the one from `api_versions_system`\nin `framework-doc-system-stubs`.\n\nTest: m framework-docs-system-stubs\n # Diff stubs before and after\nChange-Id: I0aa3a74664e2a9343e90d91b7520ce8bbcadfac5\n" }, { "commit": "9c3742afa1ed0923888b7f1ba69772373479f415", "tree": "de237ab547fcb5a3d481a1e38802e5229d3380b7", "parents": [ "7e44fa6c44cace0006511dea23de7e63e711ba06" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Tue Aug 15 14:13:23 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Mon Oct 16 17:03:45 2023 +0000" }, "message": "[CrashRecovery] Add module lib to Android SDK\n\nAdding the module libraries to combined_apis for them to be added to\nAndroid SDK.\nAlso adding bootclasspath-fragment to platform-bootclasspath.\n\nBug: b/289203818\nTest: m\n\nChange-Id: Ica9b0bddc2f9cb6621a01dcd3859c39357144b5f\n" }, { "commit": "52cc77c3163c853bddaffc3f34fdf286369e617b", "tree": "eb20cd2d1952ad7ccd351dab9e5d776b37a9b97e", "parents": [ "28dc9370caa27e93852655ff53cf41d92172b4e3", "d67ac471d6317de6dd07f3b17051107f56a6d028" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Oct 16 16:34:41 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 16 16:34:41 2023 +0000" }, "message": "Merge \"Disable validations for full api surface stub java_api_library\" into main" }, { "commit": "3cfb89b10ea5e09f85e7719ed57d76b77408ea01", "tree": "106a8797e6d921c5bc4fbefbf22ba139f967a6c7", "parents": [ "05909bca25a924536a9c9a5f51dce61fac90d591" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 13:46:17 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 13:46:17 2023 +0100" }, "message": "Remove unused `extensions_info_file` property from framework-doc-stubs\n\nThe `droidstubs.extensions_info_file` property is only used when\n`api_levels_annotations_enabled: true`. The `framwork-doc-stubs` uses\n`api_levels_module` instead and so does not need `extensions_info_file`\nany more.\n\nBug: 305688818\nTest: m framework-doc-stubs\n # Before and after and check output to confirm that it does not change\nChange-Id: I4ad3f5b24e998eb9d5d47fa2240d2281fa9d6fc6\n" }, { "commit": "d67ac471d6317de6dd07f3b17051107f56a6d028", "tree": "4aa80a0fddd3f150ba9d09a1bb3de37a048d16bf", "parents": [ "0ac140858e514a63ea6e1c95e7efde29e0855d98" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 05 21:18:23 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 13 10:39:16 2023 +0000" }, "message": "Disable validations for full api surface stub java_api_library\n\njava_api_library modules run validation to check the sanity of the API\ntext files by default when generating the stubs from txt files. However,\nthis leads to circular dependency issue when the validations are added\nto the full api surface stub java_api_library modules as droidstubs may\nset sdk_version property. Therefore, disable the validation for full api\nsurface java_api_library (e.g. android_*_stubs_current) modules.\n\nTest: m nothing --build-from-text-stub\nBug: 288624417\nChange-Id: Ib1b7b804736ef4e4cd2ea979aabea211af1927af\n" }, { "commit": "d135292fb3cc0a531decd9b3b2c0f00f31e35772", "tree": "48f0bee57759618f62377004db2638c0548c47cc", "parents": [ "47c10d04d415ac85f0babe11a2079a991a63f1e8", "4683b14cf5fe2bf25eb8428f10a1b163d238bdf1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 17:33:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 12 17:33:35 2023 +0000" }, "message": "Merge \"Add module lib and test union java_api_library module\" into main" }, { "commit": "4683b14cf5fe2bf25eb8428f10a1b163d238bdf1", "tree": "8d676c86012e8332d226ae32b3cef5ad09fd3dd0", "parents": [ "9a7e0d45103e955edeab791ee55a05100e1dc139" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 05 23:42:51 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 16:59:41 2023 +0000" }, "message": "Add module lib and test union java_api_library module\n\nCurrently, hiddenapi_modular defines test api surface as a subset of\nmodule lib api surface, causing hiddenapi check failure in from-text\nstub build. In order to mitigate this and enable the hiddenapi check in\nfrom-text stub build, this change introduces a java_api_library module\nthat generates the stub jar that contains both test and module lib\napi contributions. The module will not be available for consumption, but\nwill only be used in hiddenapi check.\n\nTest: m android_test_module_lib_stubs_current.from-text --build-from-text-stub\nBug: 191644675\nChange-Id: I2b6c9f75d9ebcfd75fa5b509dbef14aa0f88ac97\n" }, { "commit": "2e6a904ac6f5e4511a5c9430822919d3b35eab78", "tree": "124b2ddde2ed6ca460f3d3356e2b39d784efd6b6", "parents": [ "ba8f3c25cf91a632cbb955b9ddb1bd90c9710ccc" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 13:56:42 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 16:17:25 2023 +0000" }, "message": "Cleanup obsolete doc build targets\n\n- the *-check-docs target doesn\u0027t do anything the other targets don\u0027t\n- online-* are, I think, the old d.a.c targets but the ds-* targets are\n what\u0027s currently used\n- the hidden-* target isn\u0027t meaningfully different from others, either\n\nTest: presubmit\nChange-Id: Icab977d40917aa14c629629965c6126e20f4f3ee\n" }, { "commit": "ba8f3c25cf91a632cbb955b9ddb1bd90c9710ccc", "tree": "b4ab5c22ce3dd1763fd881c9f2cb69bb0c4196f8", "parents": [ "65370ed5ceb03ac853930d5e285bb6e24f204027" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 10 18:52:20 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 15:42:42 2023 +0000" }, "message": "Remove framework-doc-only-libs\n\nThey don\u0027t seem to do anything. All the docs compile without them\nand I don\u0027t see any additional warnings/errors being printed.\n\nIf they actually do something, the list is almost certainly incomplete\nanyway.\n\nTest: m docs\nChange-Id: I1bda7c4cc1d882d80cfe38ee734643c9eed030dc\n" }, { "commit": "65370ed5ceb03ac853930d5e285bb6e24f204027", "tree": "639a249617797f618b304d176f8a5695e8d49dd7", "parents": [ "34eb50956bc0d9b84228d7a85879b8194bb82013" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 13:46:34 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 15:42:11 2023 +0000" }, "message": "Don\u0027t link the framework impl in docs build\n\nThis gives the docs build access to hidden symbols, which hides issues\nin the documentation.\n\nBaseline the newly discovered issues.\n\nBug: 217734059\nTest: m docs\nMerged-In: I357f5a341a170a37152d836861a330039a83886c\nChange-Id: I357f5a341a170a37152d836861a330039a83886c\n" }, { "commit": "62023142cbc0dd3c0f7556731b762fcc23ee3965", "tree": "dda62932fba31bb4ec97af15f49c1c3e2bc5ec55", "parents": [ "031de969c6f94d746ec3a01585956e46e4ff3e25", "85be1d3879e26dc2217266ccdf145aeba487bf08" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Fri Oct 06 10:56:28 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 06 10:56:28 2023 +0000" }, "message": "Merge \"Revert \"Added new framework-pdf jar inside MediaProvider module\"\" into main" }, { "commit": "85be1d3879e26dc2217266ccdf145aeba487bf08", "tree": "8b491130b1535317c88e6b3820939f4a96263348", "parents": [ "962d4138957e6c0dbc05972ed14279b210f877df" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Thu Oct 05 16:09:16 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 05 16:09:39 2023 +0000" }, "message": "Revert \"Added new framework-pdf jar inside MediaProvider module\"\n\nRevert submission 2759049-framework-pdf\n\nReason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)\n\nReverted changes: /q/submissionid:2759049-framework-pdf\n\nChange-Id: I53b3216ec43471789a6c23c6b620c8a153953cc9\n" }, { "commit": "405169e822afdf5b9e617f10fae848875e7df45f", "tree": "ce18427b938400a92685916b2ef2914ccea56196", "parents": [ "4b20a9f47ea9cc1c2a73861c1e2e352732c8ac95", "209ae2e5d21c0c007ad4d0b53cb0a4419e1c529f" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 16:13:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 16:13:39 2023 +0000" }, "message": "Merge \"Specify lint-baseline for docs builds\" into main am: 209ae2e5d2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769722\n\nChange-Id: Ib08aeee2148641a50a42e00556f0d33adc2e8157\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b20a9f47ea9cc1c2a73861c1e2e352732c8ac95", "tree": "d8cb28ec9ab876faae94cf30c5dd3c0b175428e3", "parents": [ "3ed530e2df9b1ae998851930ce23fee60f3ec382", "61bf3646a42f45ca59fa7305d66ca34344901a29" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Wed Oct 04 16:12:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 16:12:07 2023 +0000" }, "message": "Merge \"assign labels to merged_txt modules with defs\" into main am: 61bf3646a4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765313\n\nChange-Id: Ibd5e3d0095e9238b5441f68d3a4e93bb83164b7b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "209ae2e5d21c0c007ad4d0b53cb0a4419e1c529f", "tree": "910a8d4aedd73874e0a91647550c905ca59f197d", "parents": [ "61bf3646a42f45ca59fa7305d66ca34344901a29", "0a71550e5fbd95bcda9be9e16d547ecb4fd7f225" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 15:53:49 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 04 15:53:49 2023 +0000" }, "message": "Merge \"Specify lint-baseline for docs builds\" into main" }, { "commit": "61bf3646a42f45ca59fa7305d66ca34344901a29", "tree": "d2a4d0dc94a5d6f19a7d1b06a91c4c7b7b9a2aed", "parents": [ "90693766af2cf6ad057d0c8e08275c87022c6301", "3b7e34ba717cba75077c8d7f12ae7f1a8ca907f1" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Wed Oct 04 15:45:11 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 04 15:45:11 2023 +0000" }, "message": "Merge \"assign labels to merged_txt modules with defs\" into main" }, { "commit": "0a71550e5fbd95bcda9be9e16d547ecb4fd7f225", "tree": "6d812f4c7f5932178f605b8afa8f392c34300e05", "parents": [ "4948cfd5f0da476eb2e6d861789d67a25de8b48b" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 03 12:13:25 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 13:10:56 2023 +0000" }, "message": "Specify lint-baseline for docs builds\n\nThis file is passed to doclava to baselining existing errors in the\ndocumentation. The contents of this baseline will be added in follow up\nchanges (and will be different in AOSP and internal).\n\nBug: 217734059\nTest: m docs\nChange-Id: Ibb5571fd9e55fb4f04e79e015462812e01d1ca80\n" }, { "commit": "3b7e34ba717cba75077c8d7f12ae7f1a8ca907f1", "tree": "95898c0d93a8521b841bddf8526a0e7751025c23", "parents": [ "53565bfdb0193e38f96811b58f433d961711681f" ], "author": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Wed Sep 27 22:34:57 2023 +0000" }, "committer": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Tue Oct 03 19:44:34 2023 +0000" }, "message": "assign labels to merged_txt modules with defs\n\nThis is groundwork for allowlist v2, and ensures that rdeps of\nmerged_txt targets appropriately reflect that these targets exist.\n\nFixes: 302061007\nTest: Unit test update\nChange-Id: I1d64635bb3db50ee525f1a557fd4b73d50dba879\n" }, { "commit": "0ad0bfa8491d2b47ec57689e9a0e3d31eac72661", "tree": "be4907f05cb2e21ef3782aa74b05fa6582688cc8", "parents": [ "f62b3d73aeb01f7a0a5cc0285401f8339da02429", "3bb4a8ec958ec644ebea635ed3052c2ae9fcbaac" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Tue Oct 03 17:46:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 17:46:47 2023 +0000" }, "message": "Merge \"Add soong team to owners for soong plugin\" into main am: 3bb4a8ec95\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768336\n\nChange-Id: If03a1e046824e0da81d66856afe14c7a78c19908\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3bb4a8ec958ec644ebea635ed3052c2ae9fcbaac", "tree": "bc5962587eed39fa94a3f662400994d0d9619bfc", "parents": [ "6958a77825a9bbedd624624714b86eadafcc461c", "c63c9b4f2212ea072d907df283e33f935487bb17" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Tue Oct 03 17:10:29 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 03 17:10:29 2023 +0000" }, "message": "Merge \"Add soong team to owners for soong plugin\" into main" }, { "commit": "c63c9b4f2212ea072d907df283e33f935487bb17", "tree": "b8c2a93ea997b1e11a6c0e668941e6e345be40d3", "parents": [ "53565bfdb0193e38f96811b58f433d961711681f" ], "author": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Tue Oct 03 15:55:48 2023 +0000" }, "committer": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Tue Oct 03 15:58:02 2023 +0000" }, "message": "Add soong team to owners for soong plugin\n\nTest: N/A\nChange-Id: I62ae9456a8f6a7d75acf874f4b3f555cc8a68362\n" }, { "commit": "b6bb6b70d94ed44a8d764d9f1074f8b096ab3930", "tree": "7bdb32054d937d2b394bbbdcca1a20aa3d3201b5", "parents": [ "9cdf7de28248b2866a0be1d73e717c0e6f650c15", "e1d899f2ad626b918d3658f33f84fd7103aabb53" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 03 15:52:19 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 03 15:52:19 2023 +0000" }, "message": "Merge \"Clean up prebuilt stub deps \u0026 add comment\" into main am: e1d899f2ad\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2767025\n\nChange-Id: Icb77f840a20755fa0a3245345d319c044a694ddf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1d899f2ad626b918d3658f33f84fd7103aabb53", "tree": "e3720e8c2c434ce117d4b7614d520cc0c7d9eff4", "parents": [ "2768c06f7a8723505cea678706900cbd5f91e615", "8b49d0ecaf3a07f42a30e7746c8ce8b3185ad53b" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 03 15:09:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 03 15:09:51 2023 +0000" }, "message": "Merge \"Clean up prebuilt stub deps \u0026 add comment\" into main" }, { "commit": "34d6d188a53c5a89e1a31cbe4c8dec12b1db5f4f", "tree": "03da4529114a79acfc57d6785e7637f7854421e3", "parents": [ "1512da540cf4fc8c5cd0fa7c63bc11254335892c", "4948cfd5f0da476eb2e6d861789d67a25de8b48b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 02 18:33:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 02 18:33:50 2023 +0000" }, "message": "Merge \"Add go module and workspace files\" into main am: 4948cfd5f0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2766285\n\nChange-Id: I0ee8c6d41f692f44146ee6ecb79c7b67c9dbfe0a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4948cfd5f0da476eb2e6d861789d67a25de8b48b", "tree": "49d539ddf87ac5e2f7dd695ae34ce263e2c62c56", "parents": [ "9361d76bc36b8cf3f51702e6b58750a0491ee16b", "dceb11e35d70dcfe11b9cace62708635adcaca26" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 02 17:41:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 02 17:41:17 2023 +0000" }, "message": "Merge \"Add go module and workspace files\" into main" }, { "commit": "f9641091297a2619f8d742b0f6a2a247541fbd57", "tree": "8c75c381760ba6995fc6d1c0a17fb5661ea90f85", "parents": [ "ee8af04392e40b16e3d723165cda4ce7bf829746", "e6c4de26af14ee5112325a1ff013f158317400de" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Fri Sep 29 13:26:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 29 13:26:47 2023 +0000" }, "message": "Merge \"Added new framework-pdf jar inside MediaProvider module\" into main am: e6c4de26af\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760388\n\nChange-Id: I6d833e61f568ecf73119c6ac5cd5f6d4790ea50d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e6c4de26af14ee5112325a1ff013f158317400de", "tree": "ca12b8fc6837b6d52e0dd6573d66f7f367b90494", "parents": [ "53565bfdb0193e38f96811b58f433d961711681f", "962d4138957e6c0dbc05972ed14279b210f877df" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Fri Sep 29 12:21:32 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 29 12:21:32 2023 +0000" }, "message": "Merge \"Added new framework-pdf jar inside MediaProvider module\" into main" }, { "commit": "8b49d0ecaf3a07f42a30e7746c8ce8b3185ad53b", "tree": "f669193307f2bceade353656b954551002d72246", "parents": [ "901eda31b02ed684da614870f9d44e202129ede9" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Sep 28 10:30:16 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Sep 28 10:30:16 2023 +0000" }, "message": "Clean up prebuilt stub deps \u0026 add comment\n\nThe non-updatable stub depends on a prebuilt platform stub, so that it\ncan reference APIs defined in modules. Clean up the list of previously\nneeded prebuilts that are no longer necessary, and add a comment about\nwhen it\u0027s suitable to add new prebuilts to this list.\n\nTest: m\nChange-Id: Idd5f57c774db4fc48abe4bab87c1b393079cae4d\n" }, { "commit": "4f3dc01ec113585d5bd1f880bb1c8f4ef54001bb", "tree": "565ba9d507153e42dae58423c86d39c34df15c2c", "parents": [ "db45188a5b71a115c677f53a9e92cb47b3e7b6c7", "0c787f5b6e8eac145596a20fd89ac465911311bf" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Sep 28 08:06:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 28 08:06:25 2023 +0000" }, "message": "Merge \"Expand @FlaggedApi(Flags.FLAG) in *all* API signature files\" into main am: 0c787f5b6e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765045\n\nChange-Id: I588eaa0c680916c5274d25b960e83e911efcacce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dceb11e35d70dcfe11b9cace62708635adcaca26", "tree": "1a2ac62a8ba71a64370314d6b7ad67563bb7ccdf", "parents": [ "07615e3062473c97556ce9f4f7dca70cae3a20f4" ], "author": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Wed Sep 27 22:03:40 2023 +0000" }, "committer": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Wed Sep 27 22:05:50 2023 +0000" }, "message": "Add go module and workspace files\n\nThis fixes IDE (e.g. intellij) cross referencing for the\nframeworks/base/api soong plugin\n\nFixes: 302149570\nTest: Manual\nChange-Id: Idcf09756a43e8a65bc863a24fd3c4d572751fa5c\n" }, { "commit": "85f6bee50ea1a684aa8ee4b53459de6fd34dd21b", "tree": "73f82df9eb83f533e3f058f4648e14501dbf778f", "parents": [ "f964854d1fc7f74ee9b27e6b844c999848e1571f" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Mon Sep 25 14:09:11 2023 +0200" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Wed Sep 27 15:36:31 2023 +0200" }, "message": "Expand @FlaggedApi(Flags.FLAG) in *all* API signature files\n\nA previous CL added the auto-generated aconfig Flags.FLAG sources to\nmetalava\u0027s input when generating core/api/current.txt, so metalava would\nexpand the Flags.FLAG to their values.\n\nDo the same for the build targets for the other (system, module-lib,\ntest) API signature files in core/api.\n\nAlso update the API signature files accordingly.\n\n(cherry picked from commit 162ae2a1e1beb8b9c3cad6cafbc7a471ba820d84)\n\nBug: 301859633\nTest: m checkapi\nMerged-In: Id06d77e897ecfddeaa42f75cba4d6d37bee9d1b1\nChange-Id: Id06d77e897ecfddeaa42f75cba4d6d37bee9d1b1\n" }, { "commit": "8816bd3514a00dce4571cac583e62b6e8f8351d6", "tree": "de75e85186171068e3ff24be16f8834b650cc0bd", "parents": [ "1e98131d174040744a991e9a342581d699593e09", "901eda31b02ed684da614870f9d44e202129ede9" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Sep 25 23:38:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 23:38:55 2023 +0000" }, "message": "Merge changes from topics \"remove_api_files\", \"remove_naming_convention\" into main am: 901eda31b0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756401\n\nChange-Id: I8955771036c93e8e33bf8e50c76ce8ddb35bff57\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e98131d174040744a991e9a342581d699593e09", "tree": "86ab57e3b4c0336c8ad0e1f3ad088694ef5c5183", "parents": [ "be5c6130655a1f4f23dbf739c3365ce3ecf7fbda", "25b6cedb251c3690da2e2d46bd378264aae36cf2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Sep 25 23:38:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 23:38:24 2023 +0000" }, "message": "Replace api_files prop to api_contributions am: 25b6cedb25\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756400\n\nChange-Id: Ia3c61e131d333ad37eb391196ba06210ccfb6983\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "be5c6130655a1f4f23dbf739c3365ce3ecf7fbda", "tree": "751c286b67852067b0818e383e14f983d560f454", "parents": [ "f039c56368c3283f3113184825919fd2b7def55f", "1c5022b9c33716c06b9f14d1a08126a7f31ee79f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Sep 25 23:37:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 25 23:37:38 2023 +0000" }, "message": "Remove non-updatable contribution from android_test_stubs_current_contributions am: 1c5022b9c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756399\n\nChange-Id: I129af1e13b3dec4876f2b2ace2e7d61b600b724c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "901eda31b02ed684da614870f9d44e202129ede9", "tree": "383dca117f8d5ab2e5aa6a014e0d409def5edebb", "parents": [ "9fb33563c2e0e7271361b208ec3d620cad74c6c7", "866b9b7ac6f12065dbf8fa11632289d5e34ed9ad" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Sep 25 22:31:53 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 25 22:31:53 2023 +0000" }, "message": "Merge changes from topics \"remove_api_files\", \"remove_naming_convention\" into main\n\n* changes:\n Add api_surface prop to non-updatable droidstubs\n Replace api_files prop to api_contributions\n Remove non-updatable contribution from android_test_stubs_current_contributions\n" }, { "commit": "962d4138957e6c0dbc05972ed14279b210f877df", "tree": "0d01606bdaf05ec1e95e9271cfae1e7ec80f3aef", "parents": [ "779ebfb62bb818ad2fe4a0814608d1958ecfda34" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Fri Sep 22 13:27:31 2023 +0000" }, "committer": { "name": "Mark White", "email": "anothermark@google.com", "time": "Fri Sep 22 13:29:16 2023 +0000" }, "message": "Added new framework-pdf jar inside MediaProvider module\n\nBug: 301574837\nTest: presubmit and m framework-pdf\nChange-Id: Idb7e1b784be62419011563966bf4444c4ded0128\n" }, { "commit": "0275f893c2b38a12221a40d9f46788521fa91a01", "tree": "3464a3e082edad02df337b982e2c231449a68b52", "parents": [ "7a3c7e8d6566d14dd5fc9fbe074d6262fbca9475", "779ebfb62bb818ad2fe4a0814608d1958ecfda34" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Fri Sep 22 07:19:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 22 07:19:40 2023 +0000" }, "message": "Merge \"Expand @FlaggedApi(FLAG) constants in API signature files\" into main am: 779ebfb62b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286\n\nChange-Id: I3a2b01b9d8885c71a5cb906cfa6005a98c7f2575\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "866b9b7ac6f12065dbf8fa11632289d5e34ed9ad", "tree": "ad777db8953e87d622c884b8e1ee9e2fb934c52d", "parents": [ "25b6cedb251c3690da2e2d46bd378264aae36cf2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Sep 20 22:28:05 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Sep 22 00:45:14 2023 +0000" }, "message": "Add api_surface prop to non-updatable droidstubs\n\nAll droidstubs created from sdk_library possess api_surface information,\nwhile the non-updatable droidstubs do not define this property. This\nchange defines api_surface for non-updatable droidstubs so that the\ninformation can be used in java_api_library\n\nTest: m nothing\nBug: 301321012\nChange-Id: I6c08003bb8c366f331440e52bbde776999fd6c94\n" }, { "commit": "568961726dbe0b081fbbc25aa461891c2f8ff7ba", "tree": "7636061c601f17b970367f4b9829733027090030", "parents": [ "053d01c12b5a882e91b60d42d94341f8063b055e" ], "author": { "name": "Liz Kammer", "email": "eakammer@google.com", "time": "Wed Sep 20 15:15:43 2023 +0000" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Sep 21 14:51:24 2023 +0200" }, "message": "Expand @FlaggedApi(FLAG) constants in API signature files\n\nThe auto-generated Flags.FLAG_NAME constants are difficult to review in\nAPI tracking files. metalava will expand annotation arguments if\n\n (1) the field declaration is known to metalava, and\n (2) the constant is not part of the API surface.\n\nThe auto-generated constants are hidden, so not part of any API surface.\nThis satisfies (1).\n\nThis CL adds the auto-generated sources to metalava\u0027s input. This\nsatisfies (2).\n\n(cherry picked from commit 01544b94d3b7b90dcac6f62d9528ede9e6ef2838)\n\nBug: 297881670\nTest: m checkapi\nTest: m \u003cpartition\u003e/etc/aconfig_flags.textproto \u0026 diff against a clean build\nMerged-In: I757c6e87d81768ef6095a4bea67c74c3ae6028a7\nChange-Id: I757c6e87d81768ef6095a4bea67c74c3ae6028a7\n" }, { "commit": "7b627edae1bdf73421f12fa26bcc404f7290baec", "tree": "d85743877e75f916a23dc3d726658edba19595a5", "parents": [ "eeb09cdb0dec41e67a7e97723d81d98f5992bb2f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Sep 21 01:14:17 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Sep 21 04:53:15 2023 +0000" }, "message": "Move java_api_library modules to f/b/api/StubLibraries.bp\n\nThis change was already submitted with\nhttps://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22\nbut was never propagated to downstream.\n\nTest: m nothing --build-from-text-stub\nMerged-In: I479ec3b1554dcc6630207c5f095c6f9d211b035b\nChange-Id: I4f7ea80608945d3d1840751e25fa7b0f92c119b8\n" }, { "commit": "25b6cedb251c3690da2e2d46bd378264aae36cf2", "tree": "4e482f415135b61a47fa6892473eff93620f941b", "parents": [ "1c5022b9c33716c06b9f14d1a08126a7f31ee79f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Sep 20 21:48:09 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Sep 20 22:05:20 2023 +0000" }, "message": "Replace api_files prop to api_contributions\n\nAs a process to enforce all api files in java_api_library to be passed\nvia java_api_contributions, this change removes the remaining usages of\napi_files property in java_api_library and replace them with\njava_api_contributions\n\nTest: m --build-from-text-stub\nBug: 300964421\nChange-Id: Iabeebef2cd0ab7c49d60c7e79d484df3237fced4\n" }, { "commit": "1c5022b9c33716c06b9f14d1a08126a7f31ee79f", "tree": "1de740f7c7eed2ec2e08f7d29af8ccc14fc7d7ca", "parents": [ "5a9edb9a6c4d1f706ddb3f97158b2711744b77ce" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Sep 20 22:02:29 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Sep 20 22:02:29 2023 +0000" }, "message": "Remove non-updatable contribution from android_test_stubs_current_contributions\n\nThis change fixes the defaults definition so that it is more aligned to\nthe definition of other android_*_stubs_current_contributions, which is\ncreated in frameworks/base/api/api.go\n\nTest: m nothing --build-from-text-stub\nBug: 301318660\nChange-Id: I056807c8c0bbdebda5b4ca9704f4f65e99b7f433\n" }, { "commit": "5b97b2184774433b8f4bb5d45b92ed6493cdda15", "tree": "807f68b4313b4b47fae09e858810593582dd02b6", "parents": [ "e94531c63eda2faf3d9376600d2308dec4f366e8", "0eaa4339271f7da1902f154d22dc0f8fa3800c27" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Wed Sep 20 18:32:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 20 18:32:15 2023 +0000" }, "message": "Merge \"Change ConvertWithBp2build signature\" into main am: 0eaa433927\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2751686\n\nChange-Id: Ifbe695574139c1f1f674da0470f6b1885114bcad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0eaa4339271f7da1902f154d22dc0f8fa3800c27", "tree": "378d4aa4aa031228272d493fd00d0e5f91ab4e3e", "parents": [ "5a9edb9a6c4d1f706ddb3f97158b2711744b77ce", "52f9ad09af65c1bb3c35ff83a98e4a6c09fa471c" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Wed Sep 20 17:56:24 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 20 17:56:24 2023 +0000" }, "message": "Merge \"Change ConvertWithBp2build signature\" into main" }, { "commit": "aae7f568489b4c9264034043476bbebf2aa4a4b3", "tree": "7efa34ee3e3fb8a63d0eb546232e7c198510777b", "parents": [ "21552d0af92bdbad308d27f88ef74882260b4aa2", "07e55e78b2a5740b237fd763ce6477a63eb27c13" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Sep 16 21:13:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 16 21:13:12 2023 +0000" }, "message": "Merge \"Remove --no-banner\" into main am: 07e55e78b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2752827\n\nChange-Id: I48ed921d3dce51c22878afb9ba59fb89a856adeb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "95aef061f8b889f47b2de4fa06386988fc9d2542", "tree": "705e63e7ad0719d82a0704e4c669de7b7292f388", "parents": [ "534cb77731a17b29b7cfc150eb482612aaec2481" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Sep 14 15:54:39 2023 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Sep 14 15:54:39 2023 -0700" }, "message": "Remove --no-banner\n\nThis flag was deprecated in metalava.\n\nTest: presubmits\nChange-Id: I0f9001a56104f157272c0d6a05de040305f3e7f1\n" }, { "commit": "52f9ad09af65c1bb3c35ff83a98e4a6c09fa471c", "tree": "de2cff42f0406d26ff9df3ba3b5113dadb3b7417", "parents": [ "732c0812d2e899e0ae26972a6b483a898924ed29" ], "author": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Wed Sep 13 21:30:55 2023 +0000" }, "committer": { "name": "Chris Parsons", "email": "cparsons@google.com", "time": "Wed Sep 13 21:30:55 2023 +0000" }, "message": "Change ConvertWithBp2build signature\n\nTest: See CL topic\nChange-Id: Id7d5366fd713409c2a9e12407b901d5d1d91a289\n" }, { "commit": "7d3ffbae618e9e728644a96647ed709bf39ae759", "tree": "ab369a30c6a0e17a69c8f80c6353be4de3692e10", "parents": [ "a8a87bbca9162af7add830139198c4ee899fa123", "8a809c6e46007521f75ac035ad4b1dcc1d00d9cf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 25 12:59:08 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 25 12:59:08 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I3c9e9d15786fbead1b874636b46844f6c24bccc2\nChange-Id: Id6cf6cc13baef4e67486c6271a1510146204affa\n" }, { "commit": "d122f435d437c0096466d008f1c460a62884be66", "tree": "e718929b8d7c462a89dbc56cf8789bf6e2ba226c", "parents": [ "743817ce16978a89f58f9214a76a3d3b283cb5cf", "21f8b0e94160bb3615a569cc454c5c7ffc12221d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 17 23:50:00 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 17 23:50:00 2023 +0000" }, "message": "Merge \"Revert \"Revert \"Move java_api_library modules to f/b/api/StubLib...\"\" into main" }, { "commit": "21f8b0e94160bb3615a569cc454c5c7ffc12221d", "tree": "f07c7ad5f631d6d272a53b832da0f57245a747fb", "parents": [ "a2cd198bb986763e8cb780b96ce14915e057c804" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Aug 17 18:14:35 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Aug 17 20:51:01 2023 +0000" }, "message": "Revert \"Revert \"Move java_api_library modules to f/b/api/StubLib...\"\n\nRevert submission 2713677-revert-2655262-move_java_api_libraries-JTESUMBERD\n\nReason for revert: Initial revert was created to resolve build breakage, but the breakage was caused because not all CLs included in the topic were being included in the build, and was not a problem of the CLs itself.\n\nReverted changes: /q/submissionid:2713677-revert-2655262-move_java_api_libraries-JTESUMBERD\n\nMerged-In: I479ec3b1554dcc6630207c5f095c6f9d211b035b\nChange-Id: I62fe182a5bc4418ce077f0b648efb9d358c4e7ab\n" }, { "commit": "da656f1b50f04ba7a465a285ed4cde5f8bbfb5a2", "tree": "7a6851dc9edc56fd259325f421ba0ac04f525a4b", "parents": [ "57ea4ceab660a52c005f7785676d4898b0d7d5e1", "a2cd198bb986763e8cb780b96ce14915e057c804" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Aug 17 01:36:33 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 17 01:36:33 2023 +0000" }, "message": "Merge \"Revert \"Move java_api_library modules to f/b/api/StubLibraries.bp\"\" into main" }, { "commit": "a2cd198bb986763e8cb780b96ce14915e057c804", "tree": "2ec3d8692b64be7c3f25b42da8142505572f78cf", "parents": [ "fdebc334ee0bd7f3164d5bddb20474c99e8b0f4a" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Aug 17 01:26:23 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 17 01:26:25 2023 +0000" }, "message": "Revert \"Move java_api_library modules to f/b/api/StubLibraries.bp\"\n\nRevert submission 2655262-move_java_api_libraries\n\nReason for revert: Breaking build\n\nReverted changes: /q/submissionid:2655262-move_java_api_libraries\n\nChange-Id: I00afc043165f56b66f092f311ad8b51c07d3f775\n" }, { "commit": "57ea4ceab660a52c005f7785676d4898b0d7d5e1", "tree": "46a59020a4635c1fc300ec7f4330aa25608b8693", "parents": [ "488eed6f84f4fc1a15a6097d1e60a30b3c4ad2a5", "fdebc334ee0bd7f3164d5bddb20474c99e8b0f4a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Aug 17 01:13:32 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 17 01:13:32 2023 +0000" }, "message": "Merge \"Move java_api_library modules to f/b/api/StubLibraries.bp\" into main" }, { "commit": "fdebc334ee0bd7f3164d5bddb20474c99e8b0f4a", "tree": "f07c7ad5f631d6d272a53b832da0f57245a747fb", "parents": [ "7507728a6c942ae34e73d7a59f141cca574a1cae" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Jul 12 23:59:52 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Aug 16 22:12:46 2023 +0000" }, "message": "Move java_api_library modules to f/b/api/StubLibraries.bp\n\nThis change moves the full api surface stub jar generating\njava_api_library module definitions from build/orchestrator to\nframeworks/base, in order to resolve missing dependency build failure\nfor partial repos and move the modules closer to their .from-source\nequivalents.\n\nTest: m --build-from-text-stub\nBug: 290996110\nMerged-In: I479ec3b1554dcc6630207c5f095c6f9d211b035b\nChange-Id: I479ec3b1554dcc6630207c5f095c6f9d211b035b\n" }, { "commit": "4ab9b3c2a1dfd2216982aedcbd7dad84cda2d256", "tree": "b7d5c9fa3e2602c3d6cc5ba1ad6884beb0735bc4", "parents": [ "5dd28ee157926e3667682097d3a9a19172e2dd67", "f3b1fc4e1acbc238ebb1891066df6ae688e15180" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Aug 15 11:01:09 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 15 11:01:09 2023 +0000" }, "message": "Merge \"Use new merge-signatures metalava subcommand\" into main" }, { "commit": "f3b1fc4e1acbc238ebb1891066df6ae688e15180", "tree": "753f40c0d50dd6357cd8363213d6ba23582e8197", "parents": [ "a6fac5d6c7c5ad05094c315812cc53a07729d82c" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Aug 14 22:03:06 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Aug 14 22:03:06 2023 +0100" }, "message": "Use new merge-signatures metalava subcommand\n\nBug: 295737759\nTest: ./gradlew\nChange-Id: Ied167094b04492ca49ea2b0e9d7fd91d534e483d\n" }, { "commit": "471a05bacdf43b2a120074d05df48a86e1d432da", "tree": "835baa3188b01242c0169e7f5819eb158839ca43", "parents": [ "a6fac5d6c7c5ad05094c315812cc53a07729d82c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Aug 01 06:37:17 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Aug 14 17:19:16 2023 +0000" }, "message": "Define previous_api in full api surface stubs java_api_library defaults\n\nprevious_api input is required to migrate nullness information in\nmetalava and generate loosely equivalent from-text stubs. Since\n\"android.api.public.latest\" is the only input for previous_api in the\ntree, this is hardcoded for full api surface java_api_library modules\ndefaults for now.\n\nTest: m \u0026\u0026 compare nullness annotations for from-text stubs and from-source stubs\nBug: 293962901\nChange-Id: Ic07db8c3bd37fa41ff245952c94b5c5b4773af36\n" }, { "commit": "aab881d8b7ebea74266039275d0f5bf7019e1a5b", "tree": "5d369374aad41637cd9459bbbc91a5e97efc3adb", "parents": [ "bc38028c8d2938d866fff1bba9d947e444f6106a" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Jul 11 23:22:52 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Jul 11 23:28:06 2023 +0100" }, "message": "Use new `metalava signature-to-jdiff` sub-command\n\nAlso, removes `--no-banner` as it is deprecated and `--format\u003dv2` is\nunnecessary.\n\nBug: 290825755\nTest: m current-api-xml\nChange-Id: Ib2ff55cf2bfd2128866b2e4f67cf39303135b79b\n" }, { "commit": "12cddb32c0968ccfa67cae75cd691e208e79611a", "tree": "03315c8fcad3aa0022dc7618501ead3192d73055", "parents": [ "8c8901b547b409b60887174a50a062e8816d8de7" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jun 29 21:35:24 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jun 29 22:14:38 2023 +0000" }, "message": "Rename dep_api_srcs property\n\nThis change renames java_api_library.dep_api_srcs property to\nfull_api_surface_stub, to reflect the change in aosp/2637669.\n\nTest: m nothing --build-from-text-stub\nBug: 275570206\nChange-Id: I6fc31ba33b4c067f53bae00899920dc29e16e39f\n" }, { "commit": "491c7081e76bcf3b0549508ab8dd5b2dd6b73641", "tree": "4b015b6f11462e54545500ed366572bc9828161d", "parents": [ "bdb94bb5f9fb23b594dfee7d6c19643b3f973cd2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jun 15 18:37:01 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jun 15 19:35:41 2023 +0000" }, "message": "Redefine android-non-updatable.stubs.* modules definition\n\nIn order to prevent build graph of the reverse dependencies of\nandroid-non-updatable.stubs.* from being modified based on build\nconfiguration (via --build-from-text-stub flag),\nandroid-non-updatable.stubs.* modules can be renamed with \".from-source\"\nsuffic, and android-non-updatable.stubs.* can contain either\nandroid-non-updatable.stubs.*.from-source or\nandroid-non-updatable.stubs.*.from-text as static libs based on build\nconfiguration.\n\nTest: m \u0026\u0026 m --build-from-text-stub and verify no ninja path between android-non-updatable.stubs and android-non-updatable.stubs.from-source\nBug: 287490642\nChange-Id: I9b409ce5965384ebaeb858e0bbb007dba970632a\n" }, { "commit": "cc57a141f49d04923c1f9f3cdf0c4e7264cf4c6f", "tree": "f4c233ee7d227cfa8f19fdb0fae5f9208d5a2ed3", "parents": [ "42da5485cbf3b12fde013faf5020604c41837f85", "edb881d56db8bed8c9858a755b3cf9328a81cda9" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Jun 06 20:27:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 06 20:27:41 2023 +0000" }, "message": "Merge \"Create full API surface java_library in combined_apis\" am: 2eab04105f am: b1ee6481e6 am: edb881d56d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2610109\n\nChange-Id: I5531f7a494704430f1470d6cc9ae03d2ab96b7e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1453baa8cbbfd559745c57cccffe847e53fdb3cb", "tree": "096087afbc2cf992b84757841492e7fcb1165613", "parents": [ "d52e734a2ec8935e4f246a7521e3b4f3f8e89701" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Sat May 27 05:32:30 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jun 02 17:01:14 2023 +0000" }, "message": "Create full API surface java_library in combined_apis\n\nThis change renames the full api surface stub jar generating\njava_library modules by adding \".from-source\" suffix and creating the\nmodules in combined_apis. Either the \".from-source\" module or the\n\".from-text\" module is added as static libs based on the build config.\n\nBug: 284150060\nBug: 284995489\nBug: 285410821\nTest: m \u0026\u0026 m --build-from-text-stub and verify no ninja path between android_stubs_current and android_stubs_current.from-source\nChange-Id: I1419af0cd0ca2199e82e3337717b6391a51267c4\n" }, { "commit": "1563f254901f7e73349a03885fba31d743d3908d", "tree": "0b7af8d9b27c49e8f7417924dc42632788c8c8ba", "parents": [ "c57b5c22a1a1b502628f46b9c3ac3b11a3602e03", "e3ef5d729b1c757753cbca5a98b7434b71f2dee7" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon May 22 11:03:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 22 11:03:52 2023 +0000" }, "message": "Merge \"Remove redundant private visibilities\" am: ed01b3d2cc am: a94d44fec4 am: e3ef5d729b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2594185\n\nChange-Id: Ic0c756425efef6b478b8f0c3f17687bbe628ddfc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ed01b3d2cc34a83bdbfd257ebb9dc25037cea5c4", "tree": "238185c664c94d85f69436438fc02adf7b8a7357", "parents": [ "61dae3443284f5f19ea84c51a6c574405459c45a", "9150ae4a7bd697d0936078077e9763456a5f22a3" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon May 22 09:49:29 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 22 09:49:29 2023 +0000" }, "message": "Merge \"Remove redundant private visibilities\"" }, { "commit": "7f3e3527638b22056a7231032c360383601dec89", "tree": "fc52c752c8557c681430264dbedfcb39265d5b6d", "parents": [ "b6833ca60050262c4d1c9ef8b5fcf62509b9491e", "768693bbdfe34d01d3b617388c9fc917d414ba48" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri May 19 02:31:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 19 02:31:49 2023 +0000" }, "message": "Merge \"Add java_api_library equivalence of android-non-updatable.stubs\" am: 5afdb66e27 am: 39d42ecb7f am: 768693bbdf\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2487335\n\nChange-Id: I51b632d0f177bd18cbf3c92f8ec5e202276071fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "0c101db579005a740cf4fab647e89a0c22ff568a" }