From 335dd9911beeff91870fe0386902c8d22b7deaf8 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 3 Apr 2025 13:37:14 +0530 Subject: [PATCH 1/4] Change build description in Settings > About Phone https://gitlab.e.foundation/e/os/android_build/-/commit/4a574954065d7f03e9d9f1d8e24a09068b552b9f --- scripts/gen_build_prop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index 331cc5715..02edc559d 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -111,7 +111,7 @@ def parse_args(): # build_desc is human readable strings that describe this build. This has the same info as the # build fingerprint. # e.g. "aosp_cf_x86_64_phone-userdebug VanillaIceCream MAIN eng.20240319.143939 test-keys" - config["BuildDesc"] = f"{config['DeviceProduct']}-{config['BuildVariant']} " \ + config["BuildDesc"] = f"e_{config['DeviceName']}-{config['BuildVariant']} " \ f"{config['Platform_version_name']} {config['BuildId']} " \ f"{config['BuildNumber']} {config['BuildVersionTags']}" -- GitLab From 9567315e08c851dac0756a159950e4ebc4a1f845 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 19 Feb 2025 16:06:20 +0530 Subject: [PATCH 2/4] Spoof build variant by removing "debug" in Settings > About Phone https://gitlab.e.foundation/e/os/android_build/-/commit/1f0bb7f9415326f3326a8a95a19c2af5f6b0c0ab --- scripts/gen_build_prop.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index 02edc559d..d56e9fc94 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -33,6 +33,14 @@ def get_build_variant(product_config): else: return "user" +# Spoof build variant because Whatsapp (and maybe others) +# is checking the "debug" pattern in the Build.DISPLAY variable. +def get_spoofed_build_variant(product_config): + if product_config["Eng"]: + return "eng" + else: + return "user" + def get_build_flavor(product_config): build_flavor = product_config["DeviceProduct"] + "-" + get_build_variant(product_config) if "address" in product_config.get("SanitizeDevice", []) and "_asan" not in build_flavor: @@ -91,6 +99,7 @@ def parse_args(): config["BuildFlavor"] = get_build_flavor(config) config["BuildKeys"] = get_build_keys(config) config["BuildVariant"] = get_build_variant(config) + config["SpoofedBuildVariant"] = get_spoofed_build_variant(config) config["BuildFingerprint"] = args.build_fingerprint_file.read().strip() config["BuildHostname"] = args.build_hostname_file.read().strip() @@ -111,7 +120,7 @@ def parse_args(): # build_desc is human readable strings that describe this build. This has the same info as the # build fingerprint. # e.g. "aosp_cf_x86_64_phone-userdebug VanillaIceCream MAIN eng.20240319.143939 test-keys" - config["BuildDesc"] = f"e_{config['DeviceName']}-{config['BuildVariant']} " \ + config["BuildDesc"] = f"e_{config['DeviceName']}-{config['SpoofedBuildVariant']} " \ f"{config['Platform_version_name']} {config['BuildId']} " \ f"{config['BuildNumber']} {config['BuildVersionTags']}" -- GitLab From debaa4f09cfc1ea3a21d36536777eb595014b420 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 13 Feb 2025 22:49:52 +0530 Subject: [PATCH 3/4] soong: Use our keys for otacerts if it exists Change-Id: I7a19294237964d1aaa74afa6665c10f1350832c9 --- etc/otacerts_zip.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/etc/otacerts_zip.go b/etc/otacerts_zip.go index 53ddc50d3..72ed4769f 100644 --- a/etc/otacerts_zip.go +++ b/etc/otacerts_zip.go @@ -116,8 +116,17 @@ func (m *otacertsZipModule) onlyInRecovery() bool { } func (m *otacertsZipModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { - // Read .x509.pem file defined in PRODUCT_DEFAULT_DEV_CERTIFICATE or the default test key. - pem, _ := ctx.Config().DefaultAppCertificate(ctx) + // Check if user-keys/releasekey.x509.pem exists + const userKeyPath = "user-keys/releasekey" + + var pem android.SourcePath + if android.ExistentPathForSource(ctx, userKeyPath + ".x509.pem").Valid() && + android.ExistentPathForSource(ctx,userKeyPath + ".pk8").Valid() { + pem, _ = android.PathForSource(ctx, userKeyPath + ".x509.pem"), android.PathForSource(ctx, userKeyPath + ".pk8") + } else { + // Read .x509.pem file defined in PRODUCT_DEFAULT_DEV_CERTIFICATE or the default test key. + pem, _ = ctx.Config().DefaultAppCertificate(ctx) + } // Read .x509.pem files listed in PRODUCT_EXTRA_OTA_KEYS or PRODUCT_EXTRA_RECOVERY_KEYS. extras := ctx.Config().ExtraOtaKeys(ctx, m.InRecovery()) srcPaths := append([]android.SourcePath{pem}, extras...) -- GitLab From 0bec6145006f6a526d1fc2a60dbfff8229cd7825 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 2 Jun 2025 22:50:47 +0200 Subject: [PATCH 4/4] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7a4a3ea24 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file -- GitLab