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

Commit 9e107e04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: refuse to build if bootstrapped for a different project" am: cb96d543 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2219461



Change-Id: I1c0ead552b772868031848dbc425389dfcdd3718
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a8c4650 cb96d543

build.py

+4 −0
Original line number Original line Diff line number Diff line
@@ -192,10 +192,14 @@ class HostBuild(): 
        # Output and platform directories are based on bootstrap

        # Output and platform directories are based on bootstrap

        self.output_dir = os.path.join(self.bootstrap_dir, 'output')

        self.output_dir = os.path.join(self.bootstrap_dir, 'output')

        self.platform_dir = os.path.join(self.bootstrap_dir, 'staging')

        self.platform_dir = os.path.join(self.bootstrap_dir, 'staging')

        self.bt_dir = os.path.join(self.platform_dir, 'bt')

        self.sysroot = self.args.sysroot

        self.sysroot = self.args.sysroot

        self.libdir = self.args.libdir

        self.libdir = self.args.libdir

        self.install_dir = os.path.join(self.output_dir, 'install')

        self.install_dir = os.path.join(self.output_dir, 'install')





        assert os.path.samefile(self.bt_dir,

                                os.path.dirname(__file__)), "Please rerun bootstrap for the current project!"



        # If default target isn't set, build everything

        # If default target isn't set, build everything

        self.target = 'all'

        self.target = 'all'

        if hasattr(self.args, 'target') and self.args.target:

        if hasattr(self.args, 'target') and self.args.target: