Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62ac8b56 authored by Winson's avatar Winson
Browse files

Refactor overlayable policy 

To make it easier to add the actor policy in a follow up CL,
move most of the policy handling to a central location.

The strings and transformation between strings and flags is
now handled in libidmap2policies, with libandroidfw
containing the single source of policy flags.

This also extracts all the test resource IDs into an R.h
so they can be swapped without having to edit a dozen files
each time.

Bug: 130563563

Test: m aapt2_tests idmapt2_tests and run from host test output
Test: atest libandroidfw_tests

Change-Id: Ie533c9cebf938215df7586f00c38763ae467e606
parent 4ad907d3

cmds/idmap2/Android.bp

+52 −12
Original line number Diff line number Diff line
@@ -36,18 +36,7 @@ cc_library { 
    ],

    host_supported: true,

    srcs: [

        "libidmap2/BinaryStreamVisitor.cpp",

        "libidmap2/CommandLineOptions.cpp",

        "libidmap2/FileUtils.cpp",

        "libidmap2/Idmap.cpp",

        "libidmap2/Policies.cpp",

        "libidmap2/PrettyPrintVisitor.cpp",

        "libidmap2/RawPrintVisitor.cpp",

        "libidmap2/ResourceMapping.cpp",

        "libidmap2/ResourceUtils.cpp",

        "libidmap2/Result.cpp",

        "libidmap2/XmlParser.cpp",

        "libidmap2/ZipFile.cpp",

        "libidmap2/**/*.cpp",

    ],

    export_include_dirs: ["include"],

    target: {
@@ -61,6 +50,7 @@ cc_library { 
                "libcutils",

                "libutils",

                "libziparchive",

                "libidmap2_policies",

            ],

        },

        host: {
@@ -73,6 +63,37 @@ cc_library { 
                "libcutils",

                "libutils",

                "libziparchive",

                "libidmap2_policies",

            ],

        },

    },

}



cc_library {

    name: "libidmap2_policies",

    defaults: [

        "idmap2_defaults",

    ],

    host_supported: true,

    export_include_dirs: ["libidmap2_policies/include"],

    target: {

        windows: {

            enabled: true,

        },

        android: {

            static: {

                enabled: false,

            },

            shared_libs: [

                "libandroidfw",

            ],

        },

        host: {

            shared: {

                enabled: false,

            },

            static_libs: [

                "libandroidfw",

            ],

        },

    },
@@ -118,6 +139,7 @@ cc_test { 
                "libutils",

                "libz",

                "libziparchive",

                "libidmap2_policies",

            ],

        },

        host: {
@@ -129,6 +151,7 @@ cc_test { 
                "liblog",

                "libutils",

                "libziparchive",

                "libidmap2_policies",

            ],

            shared_libs: [

                "libz",
@@ -162,6 +185,7 @@ cc_binary { 
                "libidmap2",

                "libutils",

                "libziparchive",

                "libidmap2_policies",

            ],

        },

        host: {
@@ -173,12 +197,14 @@ cc_binary { 
                "liblog",

                "libutils",

                "libziparchive",

                "libidmap2_policies",

            ],

            shared_libs: [

                "libz",

            ],

        },

    },



}



cc_binary {
@@ -199,6 +225,7 @@ cc_binary { 
        "libidmap2",

        "libutils",

        "libziparchive",

        "libidmap2_policies",

    ],

    static_libs: [

        "libidmap2daidl",
@@ -231,3 +258,16 @@ filegroup { 
    ],

    path: "idmap2d/aidl",

}



aidl_interface {

    name: "overlayable_policy_aidl",

    srcs: [":overlayable_policy_aidl_files"],

}



filegroup {

    name: "overlayable_policy_aidl_files",

    srcs: [

        "idmap2d/aidl/android/os/OverlayablePolicy.aidl",

    ],

    path: "idmap2d/aidl",

}

cmds/idmap2/idmap2/Create.cpp

+8 −8
Original line number Diff line number Diff line
@@ -20,15 +20,14 @@ 
#include <fstream>

#include <memory>

#include <ostream>

#include <sstream>

#include <string>

#include <vector>



#include "androidfw/ResourceTypes.h"

#include "idmap2/BinaryStreamVisitor.h"

#include "idmap2/CommandLineOptions.h"

#include "idmap2/FileUtils.h"

#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/PolicyUtils.h"

#include "idmap2/SysTrace.h"



using android::ApkAssets;
@@ -36,14 +35,15 @@ using android::idmap2::BinaryStreamVisitor; 
using android::idmap2::CommandLineOptions;

using android::idmap2::Error;

using android::idmap2::Idmap;

using android::idmap2::PoliciesToBitmask;

using android::idmap2::PolicyBitmask;

using android::idmap2::PolicyFlags;

using android::idmap2::Result;

using android::idmap2::Unit;

using android::idmap2::utils::kIdmapFilePermissionMask;

using android::idmap2::utils::PoliciesToBitmaskResult;

using android::idmap2::utils::UidHasWriteAccessToPath;



using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask;

using PolicyFlags = android::ResTable_overlayable_policy_header::PolicyFlags;



Result<Unit> Create(const std::vector<std::string>& args) {

  SYSTRACE << "Create " << args;

  std::string target_apk_path;
@@ -78,7 +78,7 @@ Result<Unit> Create(const std::vector<std::string>& args) { 
  }



  PolicyBitmask fulfilled_policies = 0;

  auto conv_result = PoliciesToBitmask(policies);

  auto conv_result = PoliciesToBitmaskResult(policies);

  if (conv_result) {

    fulfilled_policies |= *conv_result;

  } else {
@@ -86,7 +86,7 @@ Result<Unit> Create(const std::vector<std::string>& args) { 
  }



  if (fulfilled_policies == 0) {

    fulfilled_policies |= PolicyFlags::POLICY_PUBLIC;

    fulfilled_policies |= PolicyFlags::PUBLIC;

  }



  const std::unique_ptr<const ApkAssets> target_apk = ApkAssets::Load(target_apk_path);

cmds/idmap2/idmap2/CreateMultiple.cpp

+4 −7
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <fstream>

#include <memory>

#include <ostream>

#include <sstream>

#include <string>

#include <vector>



#include "android-base/stringprintf.h"
@@ -30,6 +28,7 @@ 
#include "idmap2/FileUtils.h"

#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/PolicyUtils.h"

#include "idmap2/SysTrace.h"

#include "Commands.h"
@@ -39,13 +38,11 @@ using android::idmap2::BinaryStreamVisitor; 
using android::idmap2::CommandLineOptions;

using android::idmap2::Error;

using android::idmap2::Idmap;

using android::idmap2::PoliciesToBitmask;

using android::idmap2::PolicyBitmask;

using android::idmap2::PolicyFlags;

using android::idmap2::Result;

using android::idmap2::Unit;

using android::idmap2::utils::kIdmapCacheDir;

using android::idmap2::utils::kIdmapFilePermissionMask;

using android::idmap2::utils::PoliciesToBitmaskResult;

using android::idmap2::utils::UidHasWriteAccessToPath;



Result<Unit> CreateMultiple(const std::vector<std::string>& args) {
@@ -81,7 +78,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
  }



  PolicyBitmask fulfilled_policies = 0;

  auto conv_result = PoliciesToBitmask(policies);

  auto conv_result = PoliciesToBitmaskResult(policies);

  if (conv_result) {

    fulfilled_policies |= *conv_result;

  } else {
@@ -89,7 +86,7 @@ Result<Unit> CreateMultiple(const std::vector<std::string>& args) { 
  }



  if (fulfilled_policies == 0) {

    fulfilled_policies |= PolicyFlags::POLICY_PUBLIC;

    fulfilled_policies |= PolicyFlags::PUBLIC;

  }



  const std::unique_ptr<const ApkAssets> target_apk = ApkAssets::Load(target_apk_path);

cmds/idmap2/idmap2/Scan.cpp

+8 −10
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <memory>

#include <ostream>

#include <set>

#include <sstream>

#include <string>

#include <utility>

#include <vector>
@@ -34,25 +33,24 @@ 
#include "idmap2/Result.h"

#include "idmap2/SysTrace.h"

#include "idmap2/XmlParser.h"

#include "idmap2/ZipFile.h"



using android::idmap2::CommandLineOptions;

using android::idmap2::Error;

using android::idmap2::Idmap;

using android::idmap2::kPolicyOdm;

using android::idmap2::kPolicyOem;

using android::idmap2::kPolicyProduct;

using android::idmap2::kPolicyPublic;

using android::idmap2::kPolicySystem;

using android::idmap2::kPolicyVendor;

using android::idmap2::PolicyBitmask;

using android::idmap2::PolicyFlags;

using android::idmap2::Result;

using android::idmap2::Unit;

using android::idmap2::policy::kPolicyOdm;

using android::idmap2::policy::kPolicyOem;

using android::idmap2::policy::kPolicyProduct;

using android::idmap2::policy::kPolicyPublic;

using android::idmap2::policy::kPolicySystem;

using android::idmap2::policy::kPolicyVendor;

using android::idmap2::utils::ExtractOverlayManifestInfo;

using android::idmap2::utils::FindFiles;

using android::idmap2::utils::OverlayManifestInfo;



using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask;



namespace {



struct InputOverlay {

cmds/idmap2/idmap2d/Idmap2Service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "idmap2/BinaryStreamVisitor.h"

#include "idmap2/FileUtils.h"

#include "idmap2/Idmap.h"

#include "idmap2/Policies.h"

#include "idmap2/SysTrace.h"

#include "utils/String8.h"
@@ -42,11 +41,12 @@ using android::binder::Status; 
using android::idmap2::BinaryStreamVisitor;

using android::idmap2::Idmap;

using android::idmap2::IdmapHeader;

using android::idmap2::PolicyBitmask;

using android::idmap2::utils::kIdmapCacheDir;

using android::idmap2::utils::kIdmapFilePermissionMask;

using android::idmap2::utils::UidHasWriteAccessToPath;



using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask;



namespace {



Status ok() {